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)
* 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>
1  2 
libavcodec/mdec.c
libavcodec/mimic.c

Simple merge
Simple merge