OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
01b6088
)
zmbv: return more meaningful error codes.
author
Anton Khirnov
<anton@khirnov.net>
Thu, 15 Nov 2012 17:18:12 +0000
(18:18 +0100)
committer
Anton Khirnov
<anton@khirnov.net>
Sun, 6 Jan 2013 12:31:39 +0000
(13:31 +0100)
libavcodec/zmbv.c
patch
|
blob
|
history
diff --git
a/libavcodec/zmbv.c
b/libavcodec/zmbv.c
index
0733fa7
..
8e0db8b
100644
(file)
--- 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
;
}
tmp = av_realloc(c->cur, avctx->width * avctx->height * (c->bpp / 8));
@@
-639,7
+639,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;