[FFmpeg-cvslog] hevc_ps: fix fixed_rate check

llyyr git at videolan.org
Sun Sep 10 22:06:00 EEST 2023


ffmpeg | branch: master | llyyr <llyyr.public at gmail.com> | Sun Sep 10 21:13:24 2023 +0530| [ded4478b8b6dbe939113b38df53778972e3af70e] | committer: Derek Buitenhuis

hevc_ps: fix fixed_rate check

Fixes: fc429d785e9e24c5520ce716d4bc3b5547e581eb

Since fc429d785e9e24c5520ce716d4bc3b5547e581eb splits the fixed_rate
flag into general and within_cvs, check for both.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ded4478b8b6dbe939113b38df53778972e3af70e
---

 libavcodec/hevc_ps.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavcodec/hevc_ps.c b/libavcodec/hevc_ps.c
index ac3fe55b07..7507d2bf9c 100644
--- a/libavcodec/hevc_ps.c
+++ b/libavcodec/hevc_ps.c
@@ -409,7 +409,8 @@ static int decode_hrd(GetBitContext *gb, int common_inf_present,
         if (!hdr->flags.fixed_pic_rate_general_flag)
             hdr->flags.fixed_pic_rate_within_cvs_flag = get_bits1(gb);
 
-        if (hdr->flags.fixed_pic_rate_within_cvs_flag)
+        if (hdr->flags.fixed_pic_rate_within_cvs_flag ||
+            hdr->flags.fixed_pic_rate_general_flag)
             hdr->elemental_duration_in_tc_minus1[i] = get_ue_golomb_long(gb);
         else
             hdr->flags.low_delay_hrd_flag = get_bits1(gb);



More information about the ffmpeg-cvslog mailing list