virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Code Issues Releases Activity

v210x: return meaningful error codes.

Browse Source
This commit is contained in:
Anton Khirnov 2012-11-17 15:34:17 +01:00
parent 39039f2405
commit 6689474b91
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/v210x.c
View File

@ -28,7 +28,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
{ {
if(avctx->width & 1){ if(avctx->width & 1){
av_log(avctx, AV_LOG_ERROR, "v210x needs even width\n"); av_log(avctx, AV_LOG_ERROR, "v210x needs even width\n");
return -1; return AVERROR(EINVAL);
} }
avctx->pix_fmt = AV_PIX_FMT_YUV422P16; avctx->pix_fmt = AV_PIX_FMT_YUV422P16;
avctx->bits_per_raw_sample= 10; avctx->bits_per_raw_sample= 10;
@ -46,13 +46,14 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
AVFrame *pic= avctx->coded_frame; AVFrame *pic= avctx->coded_frame;
const uint32_t *src= (const uint32_t *)avpkt->data; const uint32_t *src= (const uint32_t *)avpkt->data;
uint16_t *ydst, *udst, *vdst, *yend; uint16_t *ydst, *udst, *vdst, *yend;
int ret;
if(pic->data[0]) if(pic->data[0])
avctx->release_buffer(avctx, pic); avctx->release_buffer(avctx, pic);
if(avpkt->size < avctx->width * avctx->height * 8 / 3){ if(avpkt->size < avctx->width * avctx->height * 8 / 3){
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;
} }
if(avpkt->size > avctx->width * avctx->height * 8 / 3){ if(avpkt->size > avctx->width * avctx->height * 8 / 3){
@ -60,8 +61,8 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
} }
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;
ydst= (uint16_t *)pic->data[0]; ydst= (uint16_t *)pic->data[0];
udst= (uint16_t *)pic->data[1]; udst= (uint16_t *)pic->data[1];