X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fsmush.c;h=59807ab96324ccac4b8e79806607d3a5bbdcb0f4;hb=bc70684e74a185d7b80c8b80bdedda659cb581b8;hp=fe544d876112046b288ed13a8615807f006ab3d8;hpb=1f1ec958f6c68a5ceafea206a99c895f62d0f3ec;p=ffmpeg

diff --git a/libavformat/smush.c b/libavformat/smush.c
index fe544d87611..59807ab9632 100644
--- a/libavformat/smush.c
+++ b/libavformat/smush.c
@@ -31,7 +31,7 @@ typedef struct SMUSHContext {
     int video_stream_index;
 } SMUSHContext;
 
-static int smush_read_probe(AVProbeData *p)
+static int smush_read_probe(const AVProbeData *p)
 {
     if (((AV_RL32(p->buf)     == MKTAG('S', 'A', 'N', 'M') &&
           AV_RL32(p->buf + 8) == MKTAG('S', 'H', 'D', 'R')) ||
@@ -51,6 +51,7 @@ static int smush_read_header(AVFormatContext *ctx)
     uint32_t magic, nframes, size, subversion, i;
     uint32_t width = 0, height = 0, got_audio = 0, read = 0;
     uint32_t sample_rate, channels, palette[256];
+    int ret;
 
     magic = avio_rb32(pb);
     avio_skip(pb, 4); // skip movie size
@@ -157,8 +158,8 @@ static int smush_read_header(AVFormatContext *ctx)
     vst->codecpar->height     = height;
 
     if (!smush->version) {
-        if (ff_alloc_extradata(vst->codecpar, 1024 + 2))
-            return AVERROR(ENOMEM);
+        if ((ret = ff_alloc_extradata(vst->codecpar, 1024 + 2)) < 0)
+            return ret;
 
         AV_WL16(vst->codecpar->extradata, subversion);
         for (i = 0; i < 256; i++)
@@ -241,7 +242,7 @@ static int smush_read_packet(AVFormatContext *ctx, AVPacket *pkt)
     return 0;
 }
 
-AVInputFormat ff_smush_demuxer = {
+const AVInputFormat ff_smush_demuxer = {
     .name           = "smush",
     .long_name      = NULL_IF_CONFIG_SMALL("LucasArts Smush"),
     .priv_data_size = sizeof(SMUSHContext),