[FFmpeg-cvslog] avcodec/extract_extradata: Remove always-true check

Andreas Rheinhardt git at videolan.org
Fri Sep 11 16:23:17 EEST 2020


ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at gmail.com> | Mon Sep  7 14:44:04 2020 +0200| [520d9a8de229c90d82a5eafd59c28ac21b66781c] | committer: Andreas Rheinhardt

avcodec/extract_extradata: Remove always-true check

If a sequence header has already been found, it is certain that next
startcode (being disjoint from the sequence header startcode) can begin
at index four at the earliest.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>

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

 libavcodec/extract_extradata_bsf.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/libavcodec/extract_extradata_bsf.c b/libavcodec/extract_extradata_bsf.c
index 6e80076522..38517bdcf3 100644
--- a/libavcodec/extract_extradata_bsf.c
+++ b/libavcodec/extract_extradata_bsf.c
@@ -275,7 +275,6 @@ static int extract_extradata_mpeg12(AVBSFContext *ctx, AVPacket *pkt,
         if (state == 0x1B3)
             found = 1;
         else if (found && state != 0x1B5 && state < 0x200 && state >= 0x100) {
-            if (i > 3) {
                 *size = i - 3;
                 *data = av_malloc(*size + AV_INPUT_BUFFER_PADDING_SIZE);
                 if (!*data)
@@ -287,7 +286,6 @@ static int extract_extradata_mpeg12(AVBSFContext *ctx, AVPacket *pkt,
                     pkt->data += *size;
                     pkt->size -= *size;
                 }
-            }
             break;
         }
     }



More information about the ffmpeg-cvslog mailing list