[FFmpeg-cvslog] Merge commit 'fc06ee6ee377cc3b512dff8f02057e26311bc4da'

Michael Niedermayer git at videolan.org
Mon Oct 28 10:18:56 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Oct 28 10:09:47 2013 +0100| [893063781926aa23a28226384a8c46eea4e1524a] | committer: Michael Niedermayer

Merge commit 'fc06ee6ee377cc3b512dff8f02057e26311bc4da'

* commit 'fc06ee6ee377cc3b512dff8f02057e26311bc4da':
  mmvideo: fix uninitialized variable use in mm_decode_intra

Conflicts:
	libavcodec/mmvideo.c

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

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





More information about the ffmpeg-cvslog mailing list