virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-10-30 23:18:11 +02:00
Code Issues Releases Activity

msrle: return meaningful error codes.

Browse Source
This commit is contained in:
Anton Khirnov
2012-11-17 17:48:38 +01:00
parent 8fd4d1f9b9
commit 9e6764900a
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/msrle.c
View File

@@ -63,7 +63,7 @@ static av_cold int msrle_decode_init(AVCodecContext *avctx)
break;
default:
av_log(avctx, AV_LOG_ERROR, "unsupported bits per sample\n");
return -1;
return AVERROR_INVALIDDATA;
}
s->frame.data[0] = NULL;
@@ -79,15 +79,16 @@ static int msrle_decode_frame(AVCodecContext *avctx,
int buf_size = avpkt->size;
MsrleContext *s = avctx->priv_data;
int istride = FFALIGN(avctx->width*avctx->bits_per_coded_sample, 32) / 8;
int ret;
s->buf = buf;
s->size = buf_size;
s->frame.reference = 1;
s->frame.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE | FF_BUFFER_HINTS_REUSABLE;
if (avctx->reget_buffer(avctx, &s->frame)) {
if ((ret = avctx->reget_buffer(avctx, &s->frame)) < 0) {
av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
return -1;
return ret;
}
if (avctx->bits_per_coded_sample <= 8) {