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_slice.c | |
| parent | 4c5c522fc1a55940e931ece665b2b249d8f39bb1 (diff) | |
| parent | a8cbe5a0ccebf60a8a8b0aba5d5716dd54c1595c (diff) | |
| download | ffmpeg-cca4fd477851c3ab3b4ee7da525d5eb81bbe8de1.tar.gz | |
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_slice.c')
| -rw-r--r-- | libavcodec/h264_slice.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 25a5890aa8..1f2c06521e 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -1032,7 +1032,7 @@ static int h264_init_ps(H264Context *h, const H264SliceContext *sl, int first_sl h->ps.sps = (const SPS*)h->ps.sps_ref->data; if (h->mb_width != h->ps.sps->mb_width || - h->mb_height != h->ps.sps->mb_height * (2 - h->ps.sps->frame_mbs_only_flag) || + h->mb_height != h->ps.sps->mb_height || h->cur_bit_depth_luma != h->ps.sps->bit_depth_luma || h->cur_chroma_format_idc != h->ps.sps->chroma_format_idc ) @@ -1046,11 +1046,11 @@ static int h264_init_ps(H264Context *h, const H264SliceContext *sl, int first_sl must_reinit = (h->context_initialized && ( 16*sps->mb_width != h->avctx->coded_width - || 16*sps->mb_height * (2 - sps->frame_mbs_only_flag) != h->avctx->coded_height + || 16*sps->mb_height != h->avctx->coded_height || h->cur_bit_depth_luma != sps->bit_depth_luma || h->cur_chroma_format_idc != sps->chroma_format_idc || h->mb_width != sps->mb_width - || h->mb_height != sps->mb_height * (2 - sps->frame_mbs_only_flag) + || h->mb_height != sps->mb_height )); if (h->avctx->pix_fmt == AV_PIX_FMT_NONE || (non_j_pixfmt(h->avctx->pix_fmt) != non_j_pixfmt(get_pixel_format(h, 0)))) @@ -1065,7 +1065,7 @@ static int h264_init_ps(H264Context *h, const H264SliceContext *sl, int first_sl h->avctx->refs = sps->ref_frame_count; h->mb_width = sps->mb_width; - h->mb_height = sps->mb_height * (2 - sps->frame_mbs_only_flag); + h->mb_height = sps->mb_height; h->mb_num = h->mb_width * h->mb_height; h->mb_stride = h->mb_width + 1; |