ffmpeg | branch: release/4.1 | Michael Niedermayer <mich...@niedermayer.cc> | Tue Jun 25 10:29:57 2019 +0200| [df61ec263faa1408a0a63bad2d3d5bf0462dadb2] | committer: Michael Niedermayer
avcodec/hevc_ps: Change num_tile_rows/columns checks to sps->ctb_height/weight Suggested-by: James Almer <jamr...@gmail.com> Reviewed-by: James Almer <jamr...@gmail.com Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> (cherry picked from commit 3b2082c663dac93fd722289a540c1b1e24a12564) Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=df61ec263faa1408a0a63bad2d3d5bf0462dadb2 --- libavcodec/hevc_ps.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/hevc_ps.c b/libavcodec/hevc_ps.c index 1e84fcf634..9b6cc49355 100644 --- a/libavcodec/hevc_ps.c +++ b/libavcodec/hevc_ps.c @@ -1591,14 +1591,14 @@ int ff_hevc_decode_nal_pps(GetBitContext *gb, AVCodecContext *avctx, int num_tile_rows_minus1 = get_ue_golomb(gb); if (num_tile_columns_minus1 < 0 || - num_tile_columns_minus1 >= sps->width - 1) { + num_tile_columns_minus1 >= sps->ctb_width - 1) { av_log(avctx, AV_LOG_ERROR, "num_tile_columns_minus1 out of range: %d\n", num_tile_columns_minus1); ret = num_tile_columns_minus1 < 0 ? num_tile_columns_minus1 : AVERROR_INVALIDDATA; goto err; } if (num_tile_rows_minus1 < 0 || - num_tile_rows_minus1 >= sps->height - 1) { + num_tile_rows_minus1 >= sps->ctb_height - 1) { av_log(avctx, AV_LOG_ERROR, "num_tile_rows_minus1 out of range: %d\n", num_tile_rows_minus1); ret = num_tile_rows_minus1 < 0 ? num_tile_rows_minus1 : AVERROR_INVALIDDATA; _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
