diff mbox series

[FFmpeg-devel,02/11] lavc/hevcdec: drop a useless condition

Message ID 20240531174804.17572-2-anton@khirnov.net
State Accepted
Commit 79c0310acaf3b638cea2258b5b18b575668f250c
Headers show
Series [FFmpeg-devel,01/11] lavc/hevcdec: move handling of byte alignment at the end of slice header | expand

Checks

Context Check Description
yinshiyou/make_loongarch64 success Make finished
yinshiyou/make_fate_loongarch64 success Make fate finished
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished

Commit Message

Anton Khirnov May 31, 2024, 5:47 p.m. UTC 
hls_slice_data_wpp() is only called when num_entry_point_offsets>0
---
 libavcodec/hevcdec.c | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)
diff mbox series

Patch

diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c
index ad2cbd7ece..d3715f9de7 100644
--- a/libavcodec/hevcdec.c
+++ b/libavcodec/hevcdec.c
@@ -2742,16 +2742,15 @@  static int hls_slice_data_wpp(HEVCContext *s, const H2645NAL *nal)
         s->sh.offset[i - 1] = offset;
 
     }
-    if (s->sh.num_entry_point_offsets != 0) {
-        offset += s->sh.entry_point_offset[s->sh.num_entry_point_offsets - 1] - cmpt;
-        if (length < offset) {
-            av_log(s->avctx, AV_LOG_ERROR, "entry_point_offset table is corrupted\n");
-            return AVERROR_INVALIDDATA;
-        }
-        s->sh.size[s->sh.num_entry_point_offsets - 1] = length - offset;
-        s->sh.offset[s->sh.num_entry_point_offsets - 1] = offset;
 
+    offset += s->sh.entry_point_offset[s->sh.num_entry_point_offsets - 1] - cmpt;
+    if (length < offset) {
+        av_log(s->avctx, AV_LOG_ERROR, "entry_point_offset table is corrupted\n");
+        return AVERROR_INVALIDDATA;
     }
+    s->sh.size[s->sh.num_entry_point_offsets - 1] = length - offset;
+    s->sh.offset[s->sh.num_entry_point_offsets - 1] = offset;
+
     s->data = data;
 
     for (i = 1; i < s->threads_number; i++) {