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:
0a18b64
)
Detect null gop headers.
author
Michael Niedermayer
<michaelni@gmx.at>
Sun, 13 Feb 2011 16:20:46 +0000
(17:20 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Sun, 13 Feb 2011 16:20:46 +0000
(17:20 +0100)
Fix issue2592. / mpeg4-bad-gvop.raw
libavcodec/mpeg4videodec.c
patch
|
blob
|
history
diff --git
a/libavcodec/mpeg4videodec.c
b/libavcodec/mpeg4videodec.c
index
673c4e8
..
71b4622
100644
(file)
--- a/
libavcodec/mpeg4videodec.c
+++ b/
libavcodec/mpeg4videodec.c
@@
-1495,6
+1495,11
@@
end:
static int mpeg4_decode_gop_header(MpegEncContext * s, GetBitContext *gb){
int hours, minutes, seconds;
+ if(!show_bits(gb, 18)){
+ av_log(s->avctx, AV_LOG_WARNING, "GOP header invalid\n");
+ return -1;
+ }
+
hours= get_bits(gb, 5);
minutes= get_bits(gb, 6);
skip_bits1(gb);