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:
cf5f4c5
)
4xm: return error code if decode_init() failed
author
Paul B Mahol
<onemda@gmail.com>
Tue, 20 Nov 2012 09:42:32 +0000
(09:42 +0000)
committer
Paul B Mahol
<onemda@gmail.com>
Tue, 20 Nov 2012 09:42:32 +0000
(09:42 +0000)
Signed-off-by: Paul B Mahol <onemda@gmail.com>
libavcodec/4xm.c
patch
|
blob
|
history
diff --git
a/libavcodec/4xm.c
b/libavcodec/4xm.c
index
bf0241a
..
85795f9
100644
(file)
--- a/
libavcodec/4xm.c
+++ b/
libavcodec/4xm.c
@@
-941,7
+941,7
@@
static av_cold int decode_init(AVCodecContext *avctx)
if (avctx->extradata_size != 4 || !avctx->extradata) {
av_log(avctx, AV_LOG_ERROR, "extradata wrong or missing\n");
- return
1
;
+ return
AVERROR_INVALIDDATA
;
}
if((avctx->width % 16) || (avctx->height % 16)) {
av_log(avctx, AV_LOG_ERROR, "unsupported width/height\n");