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:
a1599f3
)
cdgraphics: do not return 0 from the decode function
author
Anton Khirnov
<anton@khirnov.net>
Wed, 6 Aug 2014 10:56:34 +0000
(10:56 +0000)
committer
Anton Khirnov
<anton@khirnov.net>
Wed, 6 Aug 2014 18:32:42 +0000
(18:32 +0000)
0 means no data consumed, so it can trigger an infinite loop in the
caller.
CC:libav-stable@libav.org
libavcodec/cdgraphics.c
patch
|
blob
|
history
diff --git
a/libavcodec/cdgraphics.c
b/libavcodec/cdgraphics.c
index
752003f
..
c3e42e7
100644
(file)
--- a/
libavcodec/cdgraphics.c
+++ b/
libavcodec/cdgraphics.c
@@
-349,10
+349,9
@@
static int cdg_decode_frame(AVCodecContext *avctx,
*got_frame = 1;
} else {
*got_frame = 0;
- buf_size = 0;
}
- return
buf_
size;
+ return
avpkt->
size;
}
static av_cold int cdg_decode_end(AVCodecContext *avctx)