[FFmpeg-cvslog] Merge commit '33b97faaba2744f0a2fd65c0ef9ecc2de3fad7ff'

Michael Niedermayer git at videolan.org
Wed Apr 10 23:54:47 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr 10 23:48:26 2013 +0200| [f42635a50b7af62b120c09e98dbd4a12f4d1e4b5] | committer: Michael Niedermayer

Merge commit '33b97faaba2744f0a2fd65c0ef9ecc2de3fad7ff'

* commit '33b97faaba2744f0a2fd65c0ef9ecc2de3fad7ff':
  vf_setpts: switch to an AVOptions-based system.

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

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

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





More information about the ffmpeg-cvslog mailing list