[FFmpeg-cvslog] Merge commit 'd28cb849899abd98bf2dd72f5a3dd56d441aeb27'

Michael Niedermayer git at videolan.org
Wed Apr 10 13:49:16 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr 10 13:43:19 2013 +0200| [451315830a3b8ff4014cd0dda8583f5845e5a8d0] | committer: Michael Niedermayer

Merge commit 'd28cb849899abd98bf2dd72f5a3dd56d441aeb27'

* commit 'd28cb849899abd98bf2dd72f5a3dd56d441aeb27':
  buffersrc: switch to an AVOptions-based system.

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

Commit not merged, merge left to maintainer.

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

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





More information about the ffmpeg-cvslog mailing list