avformat: Constify all muxer/demuxers

[ffmpeg] / libavformat / sccdec.c

diff --git a/libavformat/sccdec.c b/libavformat/sccdec.c
index 4d94743c81a3ac2dbe513b56be6560fe8c58cc71..5ad21a1f8bb3560df773ec87c3c089b6c61738e1 100644 (file)
--- a/libavformat/sccdec.c
+++ b/libavformat/sccdec.c
@@ -65,7 +65,6 @@ static int scc_read_header(AVFormatContext *s)
     AVStream *st = avformat_new_stream(s, NULL);
     char line2[4096], line[4096];
     int64_t pos, ts, next_ts = AV_NOPTS_VALUE;
-    int ret = 0;
     ptrdiff_t len;
     uint8_t out[4096];
     FFTextReader tr;
@@ -94,7 +93,7 @@ static int scc_read_header(AVFormatContext *s)
                     break;
             }
 
-            ts = (hh * 3600LL + mm * 60LL + ss) * 1000LL + fs * 33;
+            ts = (hh * 3600LL + mm * 60LL + ss) * 1000LL + fs * 33LL;
 
             while (!ff_text_eof(&tr)) {
                 len = ff_subtitles_read_line(&tr, line2, sizeof(line2));
@@ -118,7 +117,7 @@ static int scc_read_header(AVFormatContext *s)
             }
         }
 
-        next_ts = (hh * 3600LL + mm * 60LL + ss) * 1000LL + fs * 33;
+        next_ts = (hh * 3600LL + mm * 60LL + ss) * 1000LL + fs * 33LL;
 
         pos = ff_text_pos(&tr);
         lline = (char *)&line;
@@ -140,7 +139,7 @@ static int scc_read_header(AVFormatContext *s)
             lline = NULL;
 
             if (i > 12 && o1 == 0x94 && o2 == 0x20 && saveptr &&
-                (av_strncasecmp(saveptr, "942f", 4) || !av_strncasecmp(saveptr, "942c", 4))) {
+                (av_strncasecmp(saveptr, "942f", 4) && !av_strncasecmp(saveptr, "942c", 4))) {
 
                 out[i] = 0;
 
@@ -175,7 +174,7 @@ static int scc_read_header(AVFormatContext *s)
 
     ff_subtitles_queue_finalize(s, &scc->q);
 
-    return ret;
+    return 0;
 fail:
     ff_subtitles_queue_clean(&scc->q);
     return AVERROR(ENOMEM);
@@ -202,7 +201,7 @@ static int scc_read_close(AVFormatContext *s)
     return 0;
 }
 
-AVInputFormat ff_scc_demuxer = {
+const AVInputFormat ff_scc_demuxer = {
     .name           = "scc",
     .long_name      = NULL_IF_CONFIG_SMALL("Scenarist Closed Captions"),
     .priv_data_size = sizeof(SCCContext),