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)
commit893063781926aa23a28226384a8c46eea4e1524a
tree6e1c1f271b59a5879388a6d39fba3f7a74b3e0de
parentb96dddd3440374682b72a00bb6041563f0a8cc86
parentfc06ee6ee377cc3b512dff8f02057e26311bc4da
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@gmx.at>
libavcodec/mmvideo.c