X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fsrtdec.c;h=fa52b85566c8e55bcd5028f01a37363b4d58421c;hb=bc70684e74a185d7b80c8b80bdedda659cb581b8;hp=56bd0c43f69020502b88e859a9d47b86c9791cd8;hpb=34a0a9746b2f441db7c45983838a88aa87a33834;p=ffmpeg diff --git a/libavformat/srtdec.c b/libavformat/srtdec.c index 56bd0c43f69..fa52b85566c 100644 --- a/libavformat/srtdec.c +++ b/libavformat/srtdec.c @@ -30,7 +30,7 @@ typedef struct { FFDemuxSubtitlesQueue q; } SRTContext; -static int srt_probe(AVProbeData *p) +static int srt_probe(const AVProbeData *p) { int v; char buf[64], *pbuf; @@ -207,6 +207,8 @@ static int srt_read_header(AVFormatContext *s) ff_subtitles_queue_finalize(s, &srt->q); end: + if (res < 0) + ff_subtitles_queue_clean(&srt->q); av_bprint_finalize(&buf, NULL); return res; } @@ -232,7 +234,7 @@ static int srt_read_close(AVFormatContext *s) return 0; } -AVInputFormat ff_srt_demuxer = { +const AVInputFormat ff_srt_demuxer = { .name = "srt", .long_name = NULL_IF_CONFIG_SMALL("SubRip subtitle"), .priv_data_size = sizeof(SRTContext),