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

Merge commit 'ade402804a0e811cd00862c90559121a793054a6'

Browse Source 
* commit 'ade402804a0e811cd00862c90559121a793054a6':
  eatgv: return meaningful error codes.
  cyuv: return meaningful error codes.
  txd: return meaningful error codes.

Conflicts:
	libavcodec/cyuv.c
	libavcodec/eatgv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-01-26 14:39:02 +01:00
parent 446d62f0cf ade402804a
commit 3a9f48f033
3 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/cyuv.c
View File

@@ -52,7 +52,7 @@ static av_cold int cyuv_decode_init(AVCodecContext *avctx)
s->width = avctx->width;
/* width needs to be divisible by 4 for this codec to work */
if (s->width & 0x3)
return -1;
return AVERROR_INVALIDDATA;
s->height = avctx->height;
avcodec_get_frame_defaults(&s->frame);
@@ -84,6 +84,7 @@ static int cyuv_decode_frame(AVCodecContext *avctx,
unsigned char cur_byte;
int pixel_groups;
int rawsize = s->height * FFALIGN(s->width,2) * 2;
int ret;
if (avctx->codec_id == AV_CODEC_ID_AURA) {
y_table = u_table;
@@ -100,7 +101,7 @@ static int cyuv_decode_frame(AVCodecContext *avctx,
} else {
av_log(avctx, AV_LOG_ERROR, "got a buffer with %d bytes when %d were expected\n",
buf_size, 48 + s->height * (s->width * 3 / 4));
return -1;
return AVERROR_INVALIDDATA;
}
/* pixel data starts 48 bytes in, after 3x16-byte tables */
@@ -111,9 +112,9 @@ static int cyuv_decode_frame(AVCodecContext *avctx,
s->frame.buffer_hints = FF_BUFFER_HINTS_VALID;
s->frame.reference = 0;
if (ff_get_buffer(avctx, &s->frame) < 0) {
if ((ret = ff_get_buffer(avctx, &s->frame)) < 0) {
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
return -1;
return ret;
}
y_plane = s->frame.data[0];