diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-11-17 15:17:21 +0100 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-11-17 15:17:21 +0100 |
| commit | cca4fd477851c3ab3b4ee7da525d5eb81bbe8de1 (patch) | |
| tree | a536226e750685bf4dc0c2b587ebe7a62edf61fd /libavcodec/h264_ps.h | |
| parent | 4c5c522fc1a55940e931ece665b2b249d8f39bb1 (diff) | |
| parent | a8cbe5a0ccebf60a8a8b0aba5d5716dd54c1595c (diff) | |
Merge commit 'a8cbe5a0ccebf60a8a8b0aba5d5716dd54c1595c'
* commit 'a8cbe5a0ccebf60a8a8b0aba5d5716dd54c1595c':
h264_ps: export actual height in MBs as SPS.mb_height
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/h264_ps.h')
| -rw-r--r-- | libavcodec/h264_ps.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/h264_ps.h b/libavcodec/h264_ps.h index 9b9e295c83..51b6694b5f 100644 --- a/libavcodec/h264_ps.h +++ b/libavcodec/h264_ps.h @@ -56,7 +56,8 @@ typedef struct SPS { int ref_frame_count; ///< num_ref_frames int gaps_in_frame_num_allowed_flag; int mb_width; ///< pic_width_in_mbs_minus1 + 1 - int mb_height; ///< pic_height_in_map_units_minus1 + 1 + ///< (pic_height_in_map_units_minus1 + 1) * (2 - frame_mbs_only_flag) + int mb_height; int frame_mbs_only_flag; int mb_aff; ///< mb_adaptive_frame_field_flag int direct_8x8_inference_flag; |