[FFmpeg-cvslog] Merge commit 'bd255f9feb4deea4c990e582f0ba3b90d7b64b4c'

Michael Niedermayer git at videolan.org
Fri Dec 14 15:34:29 CET 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Dec 14 15:30:12 2012 +0100| [86b4dc6277691781015000763563d1baf212cdc7] | committer: Michael Niedermayer

Merge commit 'bd255f9feb4deea4c990e582f0ba3b90d7b64b4c'

* commit 'bd255f9feb4deea4c990e582f0ba3b90d7b64b4c':
  lavc: set frame parameters after decoding only if necessary

Conflicts:
	libavcodec/utils.c

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

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





More information about the ffmpeg-cvslog mailing list