[FFmpeg-cvslog] Merge commit '0a7c4daf469d4ac447fb822fe78337f62f4c04e6'

Michael Niedermayer git at videolan.org
Wed Mar 13 12:18:51 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Mar 13 12:12:06 2013 +0100| [ed80427e0ef59e45681930810aeb821a87e80710] | committer: Michael Niedermayer

Merge commit '0a7c4daf469d4ac447fb822fe78337f62f4c04e6'

* commit '0a7c4daf469d4ac447fb822fe78337f62f4c04e6':
  lavf: remove disabled FF_API_CLOSE_INPUT_FILE cruft

Conflicts:
	libavformat/version.h

removial postponed as the wraper code is trivial

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

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





More information about the ffmpeg-cvslog mailing list