Merge commit 'aec50f79e7460340a148a3096fe212d67edc2c64'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 29 Jan 2013 13:10:11 +0000 (14:10 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 29 Jan 2013 13:10:11 +0000 (14:10 +0100)
commit31d8d61f590ef6ebc22607d891158fc418c796a7
tree7734b1445a0a7ae6b0dc854a666a240c4d995125
parentf02033b98b7545dad2e123a939ac7dceb1ce2f7a
parentaec50f79e7460340a148a3096fe212d67edc2c64
Merge commit 'aec50f79e7460340a148a3096fe212d67edc2c64'

* commit 'aec50f79e7460340a148a3096fe212d67edc2c64':
  rawdec: use AVPALETTE_SIZE instead of magic constants.
  mimic: remove a pointless cast.
  mdec: return meaningful error codes.

Conflicts:
libavcodec/rawdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mdec.c
libavcodec/mimic.c