[FFmpeg-cvslog] Merge commit '9087eaf193b8ce99c41352064a81916fa66adb49'

Michael Niedermayer git at videolan.org
Wed Apr 10 22:32:00 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr 10 22:26:01 2013 +0200| [e434ddd4c6997aa6185d9dbb781faa2421258f04] | committer: Michael Niedermayer

Merge commit '9087eaf193b8ce99c41352064a81916fa66adb49'

* commit '9087eaf193b8ce99c41352064a81916fa66adb49':
  vf_overlay: switch to an AVOptions-based system.

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

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

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





More information about the ffmpeg-cvslog mailing list