aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorVittorio Giovara <vittorio.giovara@gmail.com>2014-02-19 03:19:23 +0100
committerVittorio Giovara <vittorio.giovara@gmail.com>2014-02-28 18:14:34 +0100
commitee6280ca12696a67535ce2245c77190edc513794 (patch)
tree5c036390cf77427ab9d945229f8397cc11309aa2 /libavcodec
parente70ab7c1f5005041bba0e4efc1165410f83495b2 (diff)
downloadffmpeg-ee6280ca12696a67535ce2245c77190edc513794.tar.gz
h264: parse two additional constraint flags
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/h264_ps.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c
index cc80f35f5a..94efaa2f7a 100644
--- a/libavcodec/h264_ps.c
+++ b/libavcodec/h264_ps.c
@@ -306,7 +306,9 @@ int ff_h264_decode_seq_parameter_set(H264Context *h)
constraint_set_flags |= get_bits1(&h->gb) << 1; // constraint_set1_flag
constraint_set_flags |= get_bits1(&h->gb) << 2; // constraint_set2_flag
constraint_set_flags |= get_bits1(&h->gb) << 3; // constraint_set3_flag
- get_bits(&h->gb, 4); // reserved
+ constraint_set_flags |= get_bits1(&h->gb) << 4; // constraint_set4_flag
+ constraint_set_flags |= get_bits1(&h->gb) << 5; // constraint_set5_flag
+ skip_bits(&h->gb, 2); // reserved_zero_2bits
level_idc = get_bits(&h->gb, 8);
sps_id = get_ue_golomb_31(&h->gb);