[FFmpeg-cvslog] Merge commit 'b7b3302f8f2c7d9f6e08e0a976890eefe3edcc9e'

Michael Niedermayer git at videolan.org
Thu Apr 11 03:28:19 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Apr 11 03:20:43 2013 +0200| [670e0f7f66207227d70898b07fe0eace767cd027] | committer: Michael Niedermayer

Merge commit 'b7b3302f8f2c7d9f6e08e0a976890eefe3edcc9e'

* commit 'b7b3302f8f2c7d9f6e08e0a976890eefe3edcc9e':
  vsrc_nullsrc: switch to an AVOptions-based system.

Conflicts:
	libavfilter/vsrc_nullsrc.c

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

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





More information about the ffmpeg-cvslog mailing list