diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-26 15:19:48 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-26 15:19:48 +0100 |
| commit | 8ab97a60ef949f9f2cc0de768143c3ce89a1aabf (patch) | |
| tree | 774977e67d24d31e78d11b94b595507beec318d2 /libavcodec/dxa.c | |
| parent | c0c06c1bba80c4bee162a3c40eec678ddc65571d (diff) | |
| parent | a0cabd0a27587525e90a44660c795d40d2f44fe2 (diff) | |
| download | ffmpeg-8ab97a60ef949f9f2cc0de768143c3ce89a1aabf.tar.gz | |
Merge commit 'a0cabd0a27587525e90a44660c795d40d2f44fe2'
* commit 'a0cabd0a27587525e90a44660c795d40d2f44fe2':
mimic: cosmetics, reformat
iff: drop ff_ prefix from a static function.
pngdec: cosmetics, reformat.
dxa: return meaningful error codes.
eatgq: cosmetics, reformat.
Conflicts:
libavcodec/dxa.c
libavcodec/eatgq.c
libavcodec/iff.c
libavcodec/mimic.c
libavcodec/pngdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dxa.c')
| -rw-r--r-- | libavcodec/dxa.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/dxa.c b/libavcodec/dxa.c index 3f489aeab9..a2fe5578df 100644 --- a/libavcodec/dxa.c +++ b/libavcodec/dxa.c @@ -211,7 +211,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPac pc = 1; } - if ((ret = ff_get_buffer(avctx, &c->pic)) < 0){ + if ((ret = ff_get_buffer(avctx, &c->pic)) < 0) { av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); return ret; } @@ -234,7 +234,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPac if (uncompress(c->decomp_buf, &dsize, avpkt->data + bytestream2_tell(&gb), bytestream2_get_bytes_left(&gb)) != Z_OK) { av_log(avctx, AV_LOG_ERROR, "Uncompress failed!\n"); - return AVERROR_INVALIDDATA; + return AVERROR_UNKNOWN; } } switch(compr){ |