[FFmpeg-cvslog] avcodec/hevc_ps: fix range of num_tile_{columns,rows}_minus1
James Almer
git at videolan.org
Fri Jul 5 22:32:09 EEST 2019
ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sun Jun 30 17:32:44 2019 -0300| [7c644989a5c27793331a14ee0f433ca177a0ffae] | committer: James Almer
avcodec/hevc_ps: fix range of num_tile_{columns,rows}_minus1
>From 7.4.3.3.1:
num_tile_columns_minus1 shall be in the range of 0 to PicWidthInCtbsY - 1, inclusive.
num_tile_rows_minus1 shall be in the range of 0 to PicHeightInCtbsY - 1, inclusive.
Reviewed-by: Michael Niedermayer <michael at niedermayer.cc>
Signed-off-by: James Almer <jamrial at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7c644989a5c27793331a14ee0f433ca177a0ffae
---
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 f6e80e1609..abf08b919b 100644
--- a/libavcodec/hevc_ps.c
+++ b/libavcodec/hevc_ps.c
@@ -1588,14 +1588,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->ctb_width - 1) {
+ num_tile_columns_minus1 >= sps->ctb_width) {
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->ctb_height - 1) {
+ num_tile_rows_minus1 >= sps->ctb_height) {
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;
More information about the ffmpeg-cvslog
mailing list