avformat: Constify all muxer/demuxers

[ffmpeg] / libavformat / shortendec.c

diff --git a/libavformat/shortendec.c b/libavformat/shortendec.c
index a2879dc5a342f6b34ba218a8f45b7107f9a6eee7..9209de4388478cc4b392d02c88082b0c18813cbd 100644 (file)
--- a/libavformat/shortendec.c
+++ b/libavformat/shortendec.c
@@ -40,12 +40,18 @@ static int shn_probe(const AVProbeData *p)
         channels = get_ur_golomb_shorten(&gb, 0);
         blocksize = 256;
     } else {
-        int k;
+        unsigned k;
         k = get_ur_golomb_shorten(&gb, 2);
+        if (k > 31)
+            return 0;
         internal_ftype = get_ur_golomb_shorten(&gb, k);
         k = get_ur_golomb_shorten(&gb, 2);
+        if (k > 31)
+            return 0;
         channels = get_ur_golomb_shorten(&gb, k);
         k = get_ur_golomb_shorten(&gb, 2);
+        if (k > 31)
+            return 0;
         blocksize = get_ur_golomb_shorten(&gb, k);
     }
 
@@ -60,7 +66,7 @@ static int shn_probe(const AVProbeData *p)
 }
 
 FF_RAW_DEMUXER_CLASS(shorten)
-AVInputFormat ff_shorten_demuxer = {
+const AVInputFormat ff_shorten_demuxer = {
     .name           = "shn",
     .long_name      = NULL_IF_CONFIG_SMALL("raw Shorten"),
     .read_probe     = shn_probe,