diff options
| author | Paul B Mahol <onemda@gmail.com> | 2013-01-07 10:48:02 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-19 16:17:24 +0100 |
| commit | ccf0cd967d32084978a4346d608b44aec56b9d25 (patch) | |
| tree | 0f012f092b631e5ea26d9ce65d60cbbd40bcb968 | |
| parent | 002ad7cd3901fe6e022f5f542d36e327bdbd7f50 (diff) | |
| download | ffmpeg-ccf0cd967d32084978a4346d608b44aec56b9d25.tar.gz | |
012v: remove double ; and return correct error code if ff_get_buffer() fails
Signed-off-by: Paul B Mahol <onemda@gmail.com>
(cherry picked from commit 25160236957647d81e8beecd6c8fb7f1949fc26e)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/012v.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/012v.c b/libavcodec/012v.c index b2c2790193..6f4533b14c 100644 --- a/libavcodec/012v.c +++ b/libavcodec/012v.c @@ -44,7 +44,7 @@ static av_cold int zero12v_decode_init(AVCodecContext *avctx) static int zero12v_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPacket *avpkt) { - int line = 0; + int line = 0, ret; const int width = avctx->width; AVFrame *pic = avctx->coded_frame; uint16_t *y, *u, *v; @@ -65,8 +65,8 @@ static int zero12v_decode_frame(AVCodecContext *avctx, void *data, } pic->reference = 0; - if (ff_get_buffer(avctx, pic) < 0) - return AVERROR_INVALIDDATA;; + if ((ret = ff_get_buffer(avctx, pic)) < 0) + return ret; y = (uint16_t *)pic->data[0]; u = (uint16_t *)pic->data[1]; |