git.videolan.org
/
ffmpeg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
avcodec/mpeg12dec: Print error/warning messages on issues in mpeg1_decode_sequence()
[ffmpeg.git]
/
libavcodec
/
mpeg12dec.c
diff --git
a/libavcodec/mpeg12dec.c
b/libavcodec/mpeg12dec.c
index
baa8e81
..
34dbebf
100644
(file)
--- a/
libavcodec/mpeg12dec.c
+++ b/
libavcodec/mpeg12dec.c
@@
-2121,11
+2121,15
@@
static int mpeg1_decode_sequence(AVCodecContext *avctx,
return -1;
}
s->frame_rate_index = get_bits(&s->gb, 4);
return -1;
}
s->frame_rate_index = get_bits(&s->gb, 4);
- if (s->frame_rate_index == 0 || s->frame_rate_index > 13)
+ 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;
return -1;
+ }
s->bit_rate = get_bits(&s->gb, 18) * 400;
s->bit_rate = get_bits(&s->gb, 18) * 400;
- if (get_bits1(&s->gb) == 0) /* marker */
+ if (get_bits1(&s->gb) == 0) { /* marker */
+ av_log(avctx, AV_LOG_ERROR, "Marker in sequence header missing\n");
return -1;
return -1;
+ }
s->width = width;
s->height = height;
s->width = width;
s->height = height;