[FFmpeg-cvslog] Merge commit '7b486ab13bfcfa88a7cd92586de50e49966ec292'

Michael Niedermayer git at videolan.org
Wed Mar 13 12:41:53 CET 2013


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

Merge commit '7b486ab13bfcfa88a7cd92586de50e49966ec292'

* commit '7b486ab13bfcfa88a7cd92586de50e49966ec292':
  lavf: remove disabled FF_API_AV_GETTIME cruft
  lavf: remove disabled FF_API_INTERLEAVE_PACKET cruft

Conflicts:
	libavformat/version.h

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

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





More information about the ffmpeg-cvslog mailing list