diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-30 00:56:24 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-30 01:00:50 +0200 |
| commit | a612bb3099eb0319567c3d682253782bee1d52de (patch) | |
| tree | 052bd6982e4ca8b360d9ec5ffe959a6058b60293 /libavcodec/pcx.c | |
| parent | 9834874f8c540773f9a727413e38ba2f6b510e2a (diff) | |
| parent | 9fb0de86b49e9fb0709a8ad1e1875e35da841887 (diff) | |
| download | android_external_ffmpeg-a612bb3099eb0319567c3d682253782bee1d52de.tar.gz android_external_ffmpeg-a612bb3099eb0319567c3d682253782bee1d52de.tar.bz2 android_external_ffmpeg-a612bb3099eb0319567c3d682253782bee1d52de.zip | |
Merge commit '9fb0de86b49e9fb0709a8ad1e1875e35da841887'
* commit '9fb0de86b49e9fb0709a8ad1e1875e35da841887':
pcx: Consume the whole packet if giving up due to missing palette
Conflicts:
libavcodec/pcx.c
See: b4e516e30e7004a0454a9009080c4de38987189a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/pcx.c')
| -rw-r--r-- | libavcodec/pcx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/pcx.c b/libavcodec/pcx.c index 67bc839efb..d8b69b3b30 100644 --- a/libavcodec/pcx.c +++ b/libavcodec/pcx.c @@ -174,7 +174,7 @@ static int pcx_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, } if (bytestream2_get_byte(&gb) != 12) { av_log(avctx, AV_LOG_ERROR, "expected palette after image data\n"); - ret = AVERROR_INVALIDDATA; + ret = avpkt->size; goto end; } } else if (nplanes == 1) { /* all packed formats, max. 16 colors */ |