diff options
| author | James Almer <jamrial@gmail.com> | 2017-11-29 21:06:49 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-11-29 21:06:49 -0300 |
| commit | d268094f889479a8edee43d8c847da8838b8bf0f (patch) | |
| tree | c18f40311df91539300d2b269a628761dbe0c12d /libavcodec/h264_sei.c | |
| parent | eb01ac6c75b5b42a9d50d405248cb3315ccb3965 (diff) | |
| parent | 99e9697e3a12ab4a6638a36b95edafd6a98f9eaa (diff) | |
Merge commit '99e9697e3a12ab4a6638a36b95edafd6a98f9eaa'
* commit '99e9697e3a12ab4a6638a36b95edafd6a98f9eaa':
stereo3d: Support view type for frame sequence type
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/h264_sei.c')
| -rw-r--r-- | libavcodec/h264_sei.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libavcodec/h264_sei.c b/libavcodec/h264_sei.c index ae5f39f775..27a37247b5 100644 --- a/libavcodec/h264_sei.c +++ b/libavcodec/h264_sei.c @@ -322,10 +322,11 @@ static int decode_frame_packing_arrangement(H264SEIFramePacking *h, h->quincunx_sampling_flag = get_bits1(gb); h->content_interpretation_type = get_bits(gb, 6); - // the following skips: spatial_flipping_flag, frame0_flipped_flag, - // field_views_flag, current_frame_is_frame0_flag, + // spatial_flipping_flag, frame0_flipped_flag, field_views_flag + skip_bits(gb, 3); + h->current_frame_is_frame0_flag = get_bits1(gb); // frame0_self_contained_flag, frame1_self_contained_flag - skip_bits(gb, 6); + skip_bits(gb, 2); if (!h->quincunx_sampling_flag && h->frame_packing_arrangement_type != 5) skip_bits(gb, 16); // frame[01]_grid_position_[xy] |