[FFmpeg-cvslog] Merge commit '45dd1ae1b3c18331f3db2293a9135bc5851e553f'

Michael Niedermayer git at videolan.org
Thu Aug 1 11:41:07 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Aug  1 11:36:54 2013 +0200| [0c8efe48917fd9d6d2c9b61397318c1fd7c3f8c4] | committer: Michael Niedermayer

Merge commit '45dd1ae1b3c18331f3db2293a9135bc5851e553f'

* commit '45dd1ae1b3c18331f3db2293a9135bc5851e553f':
  avfilter: Add some missing FF_API_AVFILTERBUFFER ifdefs

Conflicts:
	libavfilter/buffer.c
	libavfilter/internal.h

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

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





More information about the ffmpeg-cvslog mailing list