git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
88b4c1a
)
avcodec/mpeg12dec: do not fail on invalid frame_rate_index
author
Michael Niedermayer
<michaelni@gmx.at>
Thu, 20 Nov 2014 14:09:42 +0000
(15:09 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Thu, 20 Nov 2014 14:09:42 +0000
(15:09 +0100)
Fixes Ticket4073
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mpeg12dec.c
patch
|
blob
|
history
diff --git
a/libavcodec/mpeg12dec.c
b/libavcodec/mpeg12dec.c
index
34dbebf
..
36c993a
100644
(file)
--- a/
libavcodec/mpeg12dec.c
+++ b/
libavcodec/mpeg12dec.c
@@
-2123,7
+2123,7
@@
static int mpeg1_decode_sequence(AVCodecContext *avctx,
s->frame_rate_index = get_bits(&s->gb, 4);
if (s->frame_rate_index == 0 || s->frame_rate_index > 13) {
av_log(avctx, AV_LOG_WARNING, "frame_rate_index %d is invalid\n", s->frame_rate_index);
-
return -
1;
+
s->frame_rate_index =
1;
}
s->bit_rate = get_bits(&s->gb, 18) * 400;
if (get_bits1(&s->gb) == 0) { /* marker */