[FFmpeg-cvslog] Merge commit '3bcdf8dcb9891ffe49b6398d0e2c02f1712d8f00'

Michael Niedermayer git at videolan.org
Wed Mar 13 12:01:27 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Mar 13 11:53:57 2013 +0100| [feccf2f6b747e433766464e8a8b215cbe70c5f27] | committer: Michael Niedermayer

Merge commit '3bcdf8dcb9891ffe49b6398d0e2c02f1712d8f00'

* commit '3bcdf8dcb9891ffe49b6398d0e2c02f1712d8f00':
  lavc: remove disabled FF_API_SNOW cruft

Conflicts:
	libavcodec/avcodec.h
	libavcodec/options_table.h
	libavcodec/version.h

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

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





More information about the ffmpeg-cvslog mailing list