[FFmpeg-cvslog] avformat/sccdec: Avoid zero-terminating unnecessarily

Andreas Rheinhardt git at videolan.org
Sat Oct 2 18:45:15 EEST 2021


ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Fri Oct  1 15:47:51 2021 +0200| [2004d8d36dd5f85ae806ea00f7cd78a2c65d3815] | committer: Andreas Rheinhardt

avformat/sccdec: Avoid zero-terminating unnecessarily

ff_subtitles_queue_insert() does not require its events to be
zero-terminated as it has a parameter for the length.

Reviewed-by: Paul B Mahol <onemda at gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>

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

 libavformat/sccdec.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/libavformat/sccdec.c b/libavformat/sccdec.c
index 286b1b3b0e..5f90edbef6 100644
--- a/libavformat/sccdec.c
+++ b/libavformat/sccdec.c
@@ -117,8 +117,6 @@ static int scc_read_header(AVFormatContext *s)
             if (i > 12 && o1 == 0x94 && o2 == 0x20 && saveptr &&
                 (av_strncasecmp(saveptr, "942f", 4) && !av_strncasecmp(saveptr, "942c", 4))) {
 
-                out[i] = 0;
-
                 sub = ff_subtitles_queue_insert(&scc->q, out, i, 0);
                 if (!sub)
                     return AVERROR(ENOMEM);
@@ -136,8 +134,6 @@ static int scc_read_header(AVFormatContext *s)
             out[i+2] = o2;
         }
 
-        out[i] = 0;
-
         sub = ff_subtitles_queue_insert(&scc->q, out, i, 0);
         if (!sub)
             return AVERROR(ENOMEM);



More information about the ffmpeg-cvslog mailing list