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

v210dec: return meaningful error codes

Browse Source
This commit is contained in:
Anton Khirnov 2012-11-17 08:14:34 +01:00
parent c04c64c08e
commit f0547c9bd0
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/v210dec.c
View File

@ -31,7 +31,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
{ {
if (avctx->width & 1) { if (avctx->width & 1) {
av_log(avctx, AV_LOG_ERROR, "v210 needs even width\n"); av_log(avctx, AV_LOG_ERROR, "v210 needs even width\n");
return -1; return AVERROR_INVALIDDATA;
} }
avctx->pix_fmt = AV_PIX_FMT_YUV422P10; avctx->pix_fmt = AV_PIX_FMT_YUV422P10;
avctx->bits_per_raw_sample = 10; avctx->bits_per_raw_sample = 10;
@ -46,7 +46,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
AVPacket *avpkt) AVPacket *avpkt)
{ {
int h, w; int h, w, ret;
AVFrame *pic = avctx->coded_frame; AVFrame *pic = avctx->coded_frame;
const uint8_t *psrc = avpkt->data; const uint8_t *psrc = avpkt->data;
uint16_t *y, *u, *v; uint16_t *y, *u, *v;
@ -58,12 +58,12 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
if (avpkt->size < stride * avctx->height) { if (avpkt->size < stride * avctx->height) {
av_log(avctx, AV_LOG_ERROR, "packet too small\n"); av_log(avctx, AV_LOG_ERROR, "packet too small\n");
return -1; return AVERROR_INVALIDDATA;
} }
pic->reference = 0; pic->reference = 0;
if (ff_get_buffer(avctx, pic) < 0) if ((ret = ff_get_buffer(avctx, pic)) < 0)
return -1; 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];