[FFmpeg-cvslog] Merge commit '435c2a31ad5eead20eda1152097f60c3bfa22847'

Michael Niedermayer git at videolan.org
Wed Mar 13 12:34:52 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Mar 13 12:29:26 2013 +0100| [256e1f7bdfb0f84c7854b6e4147a8b349e12a905] | committer: Michael Niedermayer

Merge commit '435c2a31ad5eead20eda1152097f60c3bfa22847'

* commit '435c2a31ad5eead20eda1152097f60c3bfa22847':
  lavf: remove disabled FF_API_READ_PACKET cruft

Conflicts:
	libavformat/version.h

Removial postponed as wraper is trivial

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

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





More information about the ffmpeg-cvslog mailing list