diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-30 01:54:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-30 01:54:59 +0200 |
| commit | bbe50a8001ade24618685f6cacefc5d49a2e003c (patch) | |
| tree | 24a211e402ad41f04a959049000229d6333f1284 /libavformat/icodec.c | |
| parent | c955bac7d5c1984dcb06539fe61844b7c09b72b4 (diff) | |
| parent | ff07ec143ebd3833fd5a3f4b6c00474ac523a31f (diff) | |
| download | ffmpeg-bbe50a8001ade24618685f6cacefc5d49a2e003c.tar.gz | |
Merge commit 'ff07ec143ebd3833fd5a3f4b6c00474ac523a31f'
* commit 'ff07ec143ebd3833fd5a3f4b6c00474ac523a31f':
pcx: Return an error on broken palette if err_detect is set to 'explode'
Conflicts:
libavcodec/pcx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/icodec.c')
0 files changed, 0 insertions, 0 deletions