generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

012v: remove double ; and return correct error code if ff_get_buffer() fails

Browse Source 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
(cherry picked from commit 2516023695)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Paul B Mahol
2013-01-07 10:48:02 +00:00
committed by Michael Niedermayer
parent 002ad7cd39
commit ccf0cd967d
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/012v.c
View File

@@ -44,7 +44,7 @@ static av_cold int zero12v_decode_init(AVCodecContext *avctx)
static int zero12v_decode_frame(AVCodecContext *avctx, void *data, static int zero12v_decode_frame(AVCodecContext *avctx, void *data,
int *got_frame, AVPacket *avpkt) int *got_frame, AVPacket *avpkt)
{ {
int line = 0; int line = 0, ret;
const int width = avctx->width; const int width = avctx->width;
AVFrame *pic = avctx->coded_frame; AVFrame *pic = avctx->coded_frame;
uint16_t *y, *u, *v; uint16_t *y, *u, *v;
@@ -65,8 +65,8 @@ static int zero12v_decode_frame(AVCodecContext *avctx, void *data,
} }
pic->reference = 0; pic->reference = 0;
if (ff_get_buffer(avctx, pic) < 0) if ((ret = ff_get_buffer(avctx, pic)) < 0)
return AVERROR_INVALIDDATA;; return ret;
y = (uint16_t *)pic->data[0]; y = (uint16_t *)pic->data[0];
u = (uint16_t *)pic->data[1]; u = (uint16_t *)pic->data[1];