diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-14 14:36:17 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-14 14:43:32 +0100 |
| commit | 329675cfd71fab29e47ea9c64f3560f0305dbf36 (patch) | |
| tree | 45b4e04ad5d38aa6bbb14cb9d75729d40db2abfd /libavcodec/pcx.c | |
| parent | a646ac8ef5c51d6a47eb564d58d04564c0489871 (diff) | |
| parent | a1c525f7eb0783d31ba7a653865b6cbd3dc880de (diff) | |
| download | android_external_ffmpeg-329675cfd71fab29e47ea9c64f3560f0305dbf36.tar.gz android_external_ffmpeg-329675cfd71fab29e47ea9c64f3560f0305dbf36.tar.bz2 android_external_ffmpeg-329675cfd71fab29e47ea9c64f3560f0305dbf36.zip | |
Merge commit 'a1c525f7eb0783d31ba7a653865b6cbd3dc880de'
* commit 'a1c525f7eb0783d31ba7a653865b6cbd3dc880de':
pcx: return meaningful error codes.
tmv: return meaningful error codes.
msrle: return meaningful error codes.
cscd: return meaningful error codes.
yadif: x86: fix build for compilers without aligned stack
lavc: introduce the convenience function init_get_bits8
lavc: check for overflow in init_get_bits
Conflicts:
libavcodec/cscd.c
libavcodec/pcx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/pcx.c')
| -rw-r--r-- | libavcodec/pcx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/pcx.c b/libavcodec/pcx.c index bac818c586..d60e5020c2 100644 --- a/libavcodec/pcx.c +++ b/libavcodec/pcx.c @@ -147,8 +147,8 @@ static int pcx_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, if (p->data[0]) avctx->release_buffer(avctx, p); - if (av_image_check_size(w, h, 0, avctx)) - return AVERROR_INVALIDDATA; + if ((ret = av_image_check_size(w, h, 0, avctx)) < 0) + return ret; if (w != avctx->width || h != avctx->height) avcodec_set_dimensions(avctx, w, h); if ((ret = ff_get_buffer(avctx, p)) < 0) { |