aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-12-23 05:58:32 +0100
committerMichael Niedermayer <michaelni@gmx.at>2011-12-23 05:58:32 +0100
commitae7a6441df26b5dd921af95677ec5e6dd35dc970 (patch)
tree8c8439f5c7a34cf8c347fcdf035af55a5037ec08
parentd1c28e35300130f0ee28a3e5bbeb2cea403fad57 (diff)
downloadffmpeg-ae7a6441df26b5dd921af95677ec5e6dd35dc970.tar.gz
h264: Decode short VUI without error
Fixes 47j9R7PXBep.mov Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/h264_ps.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c
index f87957673d..5c21d80265 100644
--- a/libavcodec/h264_ps.c
+++ b/libavcodec/h264_ps.c
@@ -229,7 +229,8 @@ static inline int decode_vui_parameters(H264Context *h, SPS *sps){
if(sps->nal_hrd_parameters_present_flag || sps->vcl_hrd_parameters_present_flag)
get_bits1(&s->gb); /* low_delay_hrd_flag */
sps->pic_struct_present_flag = get_bits1(&s->gb);
-
+ if(!get_bits_left(&s->gb))
+ return 0;
sps->bitstream_restriction_flag = get_bits1(&s->gb);
if(sps->bitstream_restriction_flag){
get_bits1(&s->gb); /* motion_vectors_over_pic_boundaries_flag */