projects
/
platform
/
upstream
/
libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9402302
)
flashsv: return more meaningful error values
author
Diego Biurrun
<diego@biurrun.de>
Wed, 29 Jun 2011 22:28:08 +0000
(
00:28
+0200)
committer
Diego Biurrun
<diego@biurrun.de>
Wed, 6 Jul 2011 11:21:25 +0000
(13:21 +0200)
libavcodec/flashsv.c
patch
|
blob
|
history
diff --git
a/libavcodec/flashsv.c
b/libavcodec/flashsv.c
index 8e17ac4535fb17dc7e96cbf789ce7591578a6676..837a92243c49021d67659a5b06c8c7a53eef9dc9 100644
(file)
--- a/
libavcodec/flashsv.c
+++ b/
libavcodec/flashsv.c
@@
-150,7
+150,7
@@
static int flashsv_decode_frame(AVCodecContext *avctx, void *data,
"Frame width or height differs from first frames!\n");
av_log(avctx, AV_LOG_ERROR, "fh = %d, fv %d vs ch = %d, cv = %d\n",
avctx->height, avctx->width, s->image_height, s->image_width);
- return
-1
;
+ return
AVERROR_INVALIDDATA
;
}
av_log(avctx, AV_LOG_DEBUG,
@@
-184,7
+184,7
@@
static int flashsv_decode_frame(AVCodecContext *avctx, void *data,
if (8 * size > get_bits_left(&gb)) {
avctx->release_buffer(avctx, &s->frame);
s->frame.data[0] = NULL;
- return
-1
;
+ return
AVERROR_INVALIDDATA
;
}
if (size == 0) {