diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-06 23:59:35 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-06 23:59:35 +0100 |
commit | 7b018e5c8d182b0272477322377b8daafa1c970f (patch) | |
tree | 8f526f00d6352279d84ff8c7bcfbb2f78f702bd1 /libavcodec/zmbv.c | |
parent | 61904467458b16cf89530e2d0875f3786001dc11 (diff) | |
parent | 84f2847de394ac447f53306bd4dd73e1af6ea5e4 (diff) | |
download | ffmpeg-7b018e5c8d182b0272477322377b8daafa1c970f.tar.gz |
Merge commit '84f2847de394ac447f53306bd4dd73e1af6ea5e4'
* commit '84f2847de394ac447f53306bd4dd73e1af6ea5e4':
xl: return a meaningful error code.
xan: return a meaningful error code.
xxan: return meaningful error codes.
zmbv: return more meaningful error codes.
yop: use a meaningful error code.
c93: return meaningful error codes.
bmv: return meaningful error codes.
bmp: return meaningful error codes.
bink: operate with pointers to AVFrames instead of whole structs.
bink: return meaningful error codes.
bfi: return meaningful error codes.
bethsoftvideo: return meaningful error codes.
Conflicts:
libavcodec/c93.c
libavcodec/xl.c
libavcodec/xxan.c
libavcodec/yop.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/zmbv.c')
-rw-r--r-- | libavcodec/zmbv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/zmbv.c b/libavcodec/zmbv.c index 83743c52a2..a2d804a90c 100644 --- a/libavcodec/zmbv.c +++ b/libavcodec/zmbv.c @@ -485,7 +485,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPac zret = inflateReset(&c->zstream); if (zret != Z_OK) { av_log(avctx, AV_LOG_ERROR, "Inflate reset error: %d\n", zret); - return -1; + return AVERROR_UNKNOWN; } c->cur = av_realloc_f(c->cur, avctx->width * avctx->height, (c->bpp / 8)); @@ -642,7 +642,7 @@ static av_cold int decode_init(AVCodecContext *avctx) zret = inflateInit(&c->zstream); if (zret != Z_OK) { av_log(avctx, AV_LOG_ERROR, "Inflate init error: %d\n", zret); - return -1; + return AVERROR_UNKNOWN; } return 0; |