X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fvplayerdec.c;h=f6c2b35ea77d3e41fe280eaed081d3327b5650a0;hb=bc70684e74a185d7b80c8b80bdedda659cb581b8;hp=49943d0d0e6b0b4e9ab2d766608ad4c396166f9a;hpb=a12063b118ad05409ff775ba30fab00265ad3031;p=ffmpeg

diff --git a/libavformat/vplayerdec.c b/libavformat/vplayerdec.c
index 49943d0d0e6..f6c2b35ea77 100644
--- a/libavformat/vplayerdec.c
+++ b/libavformat/vplayerdec.c
@@ -31,7 +31,7 @@ typedef struct {
     FFDemuxSubtitlesQueue q;
 } VPlayerContext;
 
-static int vplayer_probe(AVProbeData *p)
+static int vplayer_probe(const AVProbeData *p)
 {
     char c;
     const unsigned char *ptr = p->buf;
@@ -83,8 +83,10 @@ static int vplayer_read_header(AVFormatContext *s)
             AVPacket *sub;
 
             sub = ff_subtitles_queue_insert(&vplayer->q, p, strlen(p), 0);
-            if (!sub)
+            if (!sub) {
+                ff_subtitles_queue_clean(&vplayer->q);
                 return AVERROR(ENOMEM);
+            }
             sub->pos = pos;
             sub->pts = pts_start;
             sub->duration = -1;
@@ -116,7 +118,7 @@ static int vplayer_read_close(AVFormatContext *s)
     return 0;
 }
 
-AVInputFormat ff_vplayer_demuxer = {
+const AVInputFormat ff_vplayer_demuxer = {
     .name           = "vplayer",
     .long_name      = NULL_IF_CONFIG_SMALL("VPlayer subtitles"),
     .priv_data_size = sizeof(VPlayerContext),