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:
f031531
)
avcodec/mpeg12dec: Use skip_1stop_8data_bits()
author
Michael Niedermayer
<michaelni@gmx.at>
Wed, 30 Oct 2013 17:28:00 +0000
(18:28 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Wed, 30 Oct 2013 20:29:21 +0000
(21:29 +0100)
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
6b6c03e
..
5e320bd
100644
(file)
--- a/
libavcodec/mpeg12dec.c
+++ b/
libavcodec/mpeg12dec.c
@@
-1639,9
+1639,8
@@
static int mpeg_decode_slice(MpegEncContext *s, int mb_y,
}
/* extra slice info */
- while (get_bits1(&s->gb) != 0) {
- skip_bits(&s->gb, 8);
- }
+ if (skip_1stop_8data_bits(&s->gb) < 0)
+ return AVERROR_INVALIDDATA;
s->mb_x = 0;