Merge commit 'fc06ee6ee377cc3b512dff8f02057e26311bc4da'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 28 Oct 2013 09:09:47 +0000 (10:09 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 28 Oct 2013 09:12:13 +0000 (10:12 +0100)
* commit 'fc06ee6ee377cc3b512dff8f02057e26311bc4da':
  mmvideo: fix uninitialized variable use in mm_decode_intra

Conflicts:
libavcodec/mmvideo.c

See: c2e3b564b32d596f5a66d47409f9e07a067a3084
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/mmvideo.c

Simple merge