[FFmpeg-cvslog] Merge commit 'f13ab29925883b4245da4129694af3af378d67be'

Michael Niedermayer git at videolan.org
Wed Apr 10 19:27:35 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr 10 19:21:59 2013 +0200| [81c1ed748be53da95c2dbda4e16794afcf0851b3] | committer: Michael Niedermayer

Merge commit 'f13ab29925883b4245da4129694af3af378d67be'

* commit 'f13ab29925883b4245da4129694af3af378d67be':
  vf_fps: switch to an AVOptions-based system.

Conflicts:
	libavfilter/vf_fps.c

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

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





More information about the ffmpeg-cvslog mailing list