[FFmpeg-cvslog] Merge commit 'a42d6e6c4c19912b73cae8ca9133b4202667c303'

Michael Niedermayer git at videolan.org
Thu Apr 11 03:48:10 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Apr 11 03:38:34 2013 +0200| [3a3d984445f0e49e692f712ebb51a4b7e6bb006c] | committer: Michael Niedermayer

Merge commit 'a42d6e6c4c19912b73cae8ca9133b4202667c303'

* commit 'a42d6e6c4c19912b73cae8ca9133b4202667c303':
  vsrc_movie: switch to an AVOptions-based system.

Conflicts:
	doc/filters.texi
	libavfilter/src_movie.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3a3d984445f0e49e692f712ebb51a4b7e6bb006c
---





More information about the ffmpeg-cvslog mailing list