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/qtrle.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/qtrle.c')
| -rw-r--r-- | libavcodec/qtrle.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/qtrle.c b/libavcodec/qtrle.c index 41fda4b3b6..5acd2eb3ae 100644 --- a/libavcodec/qtrle.c +++ b/libavcodec/qtrle.c @@ -407,14 +407,15 @@ static int qtrle_decode_frame(AVCodecContext *avctx, int header, start_line; int height, row_ptr; int has_palette = 0; + int ret; bytestream2_init(&s->g, avpkt->data, avpkt->size); s->frame.reference = 3; s->frame.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE | FF_BUFFER_HINTS_REUSABLE | FF_BUFFER_HINTS_READABLE; - if (avctx->reget_buffer(avctx, &s->frame)) { + if ((ret = avctx->reget_buffer(avctx, &s->frame)) < 0) { av_log (s->avctx, AV_LOG_ERROR, "reget_buffer() failed\n"); - return -1; + return ret; } /* check if this frame is even supposed to change */ |