diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-14 15:04:58 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-14 15:04:58 +0100 |
| commit | 8943925d1f68316218a9722c3f275ae1ae29b325 (patch) | |
| tree | 455f017242d1ab01e0eb2e4ae981b79e986e2015 /libavcodec/qpeg.c | |
| parent | 329675cfd71fab29e47ea9c64f3560f0305dbf36 (diff) | |
| parent | 688b132b881d423877e38dc82f17e23a604be676 (diff) | |
| download | ffmpeg-8943925d1f68316218a9722c3f275ae1ae29b325.tar.gz | |
Merge commit '688b132b881d423877e38dc82f17e23a604be676'
* commit '688b132b881d423877e38dc82f17e23a604be676':
qdrw: return meaningful error codes.
qtrle: return a meaningful error code.
gifdec: return meaningful error codes.
interplayvideo: remove a static variable.
interplayvideo: return meaningful error codes.
lcldec: return meaningful error codes.
targa: return meaningful error codes.
qpeg: return a meaningful error code.
nuv: return meaningful error codes.
Conflicts:
libavcodec/gifdec.c
libavcodec/interplayvideo.c
libavcodec/nuv.c
libavcodec/qpeg.c
libavcodec/targa.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/qpeg.c')
| -rw-r--r-- | libavcodec/qpeg.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/qpeg.c b/libavcodec/qpeg.c index 105ac69600..73d652e5d8 100644 --- a/libavcodec/qpeg.c +++ b/libavcodec/qpeg.c @@ -258,7 +258,7 @@ static int decode_frame(AVCodecContext *avctx, AVFrame * p = &a->pic; AVFrame * ref= &a->ref; uint8_t* outdata; - int delta; + int delta, ret; const uint8_t *pal = av_packet_get_side_data(avpkt, AV_PKT_DATA_PALETTE, NULL); if (avpkt->size < 0x86) { @@ -273,9 +273,9 @@ static int decode_frame(AVCodecContext *avctx, FFSWAP(AVFrame, *ref, *p); p->reference= 3; - if(ff_get_buffer(avctx, p) < 0){ + if ((ret = ff_get_buffer(avctx, p)) < 0) { av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); - return -1; + return ret; } outdata = a->pic.data[0]; bytestream2_skip(&a->buffer, 4); |