RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avrndec: use more meaningful error codes 

Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2012-11-05 20:44:21 +00:00
parent 70727e8774
commit 10ac70d249
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/avrndec.c
View File

@ -42,7 +42,7 @@ static av_cold int init(AVCodecContext *avctx)
return ff_mjpeg_decode_init(avctx); return ff_mjpeg_decode_init(avctx);
if(avctx->width <= 0 || avctx->height <= 0) if(avctx->width <= 0 || avctx->height <= 0)
return -1; return AVERROR_INVALIDDATA;
avcodec_get_frame_defaults(&a->frame); avcodec_get_frame_defaults(&a->frame);
avctx->pix_fmt = AV_PIX_FMT_UYVY422; avctx->pix_fmt = AV_PIX_FMT_UYVY422;
@ -79,7 +79,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac
const uint8_t *buf = avpkt->data; const uint8_t *buf = avpkt->data;
int buf_size = avpkt->size; int buf_size = avpkt->size;
int true_height = buf_size / (2*avctx->width); int true_height = buf_size / (2*avctx->width);
int y; int y, ret;
if(a->is_mjpeg) if(a->is_mjpeg)
return ff_mjpeg_decode_frame(avctx, data, data_size, avpkt); return ff_mjpeg_decode_frame(avctx, data, data_size, avpkt);
@ -92,9 +92,9 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
if(avctx->get_buffer(avctx, p) < 0){ if((ret = avctx->get_buffer(avctx, p)) < 0){
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
return -1; return ret;
} }
p->pict_type= AV_PICTURE_TYPE_I; p->pict_type= AV_PICTURE_TYPE_I;
p->key_frame= 1; p->key_frame= 1;