diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-14 15:17:16 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-14 15:17:16 +0100 |
| commit | 4adc8a29a0565cb35815eeb8e693b47dcaf890ce (patch) | |
| tree | 69f03cedcda1457ba0c5303c2dc70437aa38f0c0 /libavcodec/vcr1.c | |
| parent | 8943925d1f68316218a9722c3f275ae1ae29b325 (diff) | |
| parent | 74a9a624c5c4d50760d8d57458eba57366f6cb26 (diff) | |
| download | ffmpeg-4adc8a29a0565cb35815eeb8e693b47dcaf890ce.tar.gz | |
Merge commit '74a9a624c5c4d50760d8d57458eba57366f6cb26'
* commit '74a9a624c5c4d50760d8d57458eba57366f6cb26':
vcr1: return a meaningful error code.
rpza: return a meaningful error code.
qdrw: cosmetics, reformat
Conflicts:
libavcodec/qdrw.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vcr1.c')
| -rw-r--r-- | libavcodec/vcr1.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/vcr1.c b/libavcodec/vcr1.c index 778ad0d8c2..e51ef15dbc 100644 --- a/libavcodec/vcr1.c +++ b/libavcodec/vcr1.c @@ -77,7 +77,7 @@ static int vcr1_decode_frame(AVCodecContext *avctx, void *data, AVFrame *picture = data; AVFrame *const p = &a->picture; const uint8_t *bytestream = buf; - int i, x, y; + int i, x, y, ret; if (p->data[0]) avctx->release_buffer(avctx, p); @@ -88,9 +88,9 @@ static int vcr1_decode_frame(AVCodecContext *avctx, void *data, } p->reference = 0; - 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; } p->pict_type = AV_PICTURE_TYPE_I; p->key_frame = 1; |