diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-01 04:50:08 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-01 04:51:05 +0100 |
| commit | 983c7f4015baee2e5565c5702dd76dc4c8620aa7 (patch) | |
| tree | 4c7a5eaca307ca09de3d9ad426c4f0ba93970475 /libavcodec/h264_ps.c | |
| parent | 3ec3f70ddb1b97fd6174ab3ca8617d8a1a6516ab (diff) | |
| parent | ee6280ca12696a67535ce2245c77190edc513794 (diff) | |
Merge commit 'ee6280ca12696a67535ce2245c77190edc513794'
* commit 'ee6280ca12696a67535ce2245c77190edc513794':
h264: parse two additional constraint flags
Conflicts:
libavcodec/h264_ps.c
See: 9091ba9dfa0901bdce8305cf282c747b0f4c942e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_ps.c')
| -rw-r--r-- | libavcodec/h264_ps.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c index 63b4d83c18..cf27b4588c 100644 --- a/libavcodec/h264_ps.c +++ b/libavcodec/h264_ps.c @@ -335,7 +335,7 @@ int ff_h264_decode_seq_parameter_set(H264Context *h) constraint_set_flags |= get_bits1(&h->gb) << 3; // constraint_set3_flag constraint_set_flags |= get_bits1(&h->gb) << 4; // constraint_set4_flag constraint_set_flags |= get_bits1(&h->gb) << 5; // constraint_set5_flag - get_bits(&h->gb, 2); // reserved + skip_bits(&h->gb, 2); // reserved_zero_2bits level_idc = get_bits(&h->gb, 8); sps_id = get_ue_golomb_31(&h->gb); |