summaryrefslogtreecommitdiffstats
path: root/libavcodec/012v.c
diff options
context:
space:
mode:
authorPaul B Mahol <onemda@gmail.com>2013-01-07 10:48:02 +0000
committerPaul B Mahol <onemda@gmail.com>2013-01-07 10:48:02 +0000
commit25160236957647d81e8beecd6c8fb7f1949fc26e (patch)
tree967843e2159b99b718136e2bdc55d3d553930812 /libavcodec/012v.c
parent7f7f31bfcb7d7c0094673a6bfbbf263fb5166aba (diff)
downloadffmpeg-streaming-25160236957647d81e8beecd6c8fb7f1949fc26e.zip
ffmpeg-streaming-25160236957647d81e8beecd6c8fb7f1949fc26e.tar.gz
012v: remove double ; and return correct error code if ff_get_buffer() fails
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Diffstat (limited to 'libavcodec/012v.c')
-rw-r--r--libavcodec/012v.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/012v.c b/libavcodec/012v.c
index b2c2790..6f4533b 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];
OpenPOWER on IntegriCloud