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

r210dec: return meaningful error codes.

Browse Source
This commit is contained in:
Anton Khirnov 2012-11-17 15:31:35 +01:00
parent 4324a3ce75
commit 39039f2405
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/r210dec.c
View File

@ -38,7 +38,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 uint32_t *src = (const uint32_t *)avpkt->data; const uint32_t *src = (const uint32_t *)avpkt->data;
int aligned_width = FFALIGN(avctx->width, 64); int aligned_width = FFALIGN(avctx->width, 64);
@ -49,12 +49,12 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
if (avpkt->size < 4 * aligned_width * avctx->height) { if (avpkt->size < 4 * aligned_width * 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;
pic->pict_type = AV_PICTURE_TYPE_I; pic->pict_type = AV_PICTURE_TYPE_I;
pic->key_frame = 1; pic->key_frame = 1;