[FFmpeg-cvslog] Merge commit '5e6ee38bd3cef0dd05f1dd7977c71f3479eb6d01'

Michael Niedermayer git at videolan.org
Mon Dec 31 13:59:39 CET 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Dec 31 13:40:15 2012 +0100| [98275283d52622c16a6d59f508de7d40216e8b63] | committer: Michael Niedermayer

Merge commit '5e6ee38bd3cef0dd05f1dd7977c71f3479eb6d01'

* commit '5e6ee38bd3cef0dd05f1dd7977c71f3479eb6d01':
  FATE: add cavs test
  cavsdec: export picture type in the output frame

Conflicts:
	tests/fate/video.mak

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

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





More information about the ffmpeg-cvslog mailing list