diff mbox series

[FFmpeg-devel,35/39] lavc/hevcdec: drop a redundant multiple-frame-per-packet check

Message ID 20240607130135.9088-35-anton@khirnov.net
State New
Headers show
Series [FFmpeg-devel,01/39] lavc/hevcdec: do not free SliceHeader arrays in pic_arrays_free() | expand

Commit Message

Anton Khirnov June 7, 2024, 1:01 p.m. UTC 
---
 libavcodec/hevc/hevcdec.c | 4 ----
 libavcodec/hevc/hevcdec.h | 1 -
 2 files changed, 5 deletions(-)
diff mbox series

Patch

diff --git a/libavcodec/hevc/hevcdec.c b/libavcodec/hevc/hevcdec.c
index a241e25196..b9aea45edb 100644
--- a/libavcodec/hevc/hevcdec.c
+++ b/libavcodec/hevc/hevcdec.c
@@ -3143,7 +3143,6 @@  static int decode_nal_unit(HEVCContext *s, const H2645NAL *nal)
                 goto fail;
             }
 
-            s->overlap ++;
             ret = hevc_frame_start(s);
             if (ret < 0)
                 return ret;
@@ -3204,7 +3203,6 @@  static int decode_nal_units(HEVCContext *s, const uint8_t *buf, int length)
     s->cur_frame = s->collocated_ref = NULL;
     s->last_eos = s->eos;
     s->eos = 0;
-    s->overlap = 0;
     s->slice_initialized = 0;
 
     /* split the input packet into NAL units, so we know the upper bound on the
@@ -3271,8 +3269,6 @@  static int decode_nal_units(HEVCContext *s, const uint8_t *buf, int length)
             continue;
 
         ret = decode_nal_unit(s, nal);
-        if (ret >= 0 && s->overlap > 2)
-            ret = AVERROR_INVALIDDATA;
         if (ret < 0) {
             av_log(s->avctx, AV_LOG_WARNING,
                    "Error parsing NAL unit #%d.\n", i);
diff --git a/libavcodec/hevc/hevcdec.h b/libavcodec/hevc/hevcdec.h
index e47a7107c8..f0443b3ab9 100644
--- a/libavcodec/hevc/hevcdec.h
+++ b/libavcodec/hevc/hevcdec.h
@@ -487,7 +487,6 @@  typedef struct HEVCContext {
     int last_eos;  ///< last packet contains an EOS/EOB NAL
     int bs_width;
     int bs_height;
-    int overlap;
 
     int is_decoded;
     // NoRaslOutputFlag associated with the last IRAP frame