diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-29 14:10:11 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-29 14:10:11 +0100 |
| commit | 31d8d61f590ef6ebc22607d891158fc418c796a7 (patch) | |
| tree | 7734b1445a0a7ae6b0dc854a666a240c4d995125 /libavcodec/srtdec.c | |
| parent | f02033b98b7545dad2e123a939ac7dceb1ce2f7a (diff) | |
| parent | aec50f79e7460340a148a3096fe212d67edc2c64 (diff) | |
| download | ffmpeg-31d8d61f590ef6ebc22607d891158fc418c796a7.tar.gz | |
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>
Diffstat (limited to 'libavcodec/srtdec.c')
0 files changed, 0 insertions, 0 deletions