[FFmpeg-cvslog] Merge commit '40c885c589808455a1c4b473509f1e6cd4908f55'

Michael Niedermayer git at videolan.org
Wed Apr 10 22:57:38 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr 10 22:50:32 2013 +0200| [7e99ccf5d8c25d7fe670d9402349b055c0c1449a] | committer: Michael Niedermayer

Merge commit '40c885c589808455a1c4b473509f1e6cd4908f55'

* commit '40c885c589808455a1c4b473509f1e6cd4908f55':
  vf_pad: switch to an AVOptions-based system.

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

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

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





More information about the ffmpeg-cvslog mailing list