configure: Drop weak dependencies on external libraries for webm muxer

[ffmpeg] / libavformat / srtdec.c

diff --git a/libavformat/srtdec.c b/libavformat/srtdec.c
index 8927164ff57803a3eec65bc7c121cc8a21b0c771..6f8206c75576da35d102d7565b80da704b613040 100644 (file)
--- a/libavformat/srtdec.c
+++ b/libavformat/srtdec.c
@@ -40,14 +40,14 @@ static int srt_probe(AVProbeData *p)
     return 0;
 }
 
-static int srt_read_header(AVFormatContext *s, AVFormatParameters *ap)
+static int srt_read_header(AVFormatContext *s)
 {
     AVStream *st = avformat_new_stream(s, NULL);
     if (!st)
         return -1;
-    av_set_pts_info(st, 64, 1, 1000);
-    st->codec->codec_type = AVMEDIA_TYPE_SUBTITLE;
-    st->codec->codec_id   = CODEC_ID_SRT;
+    avpriv_set_pts_info(st, 64, 1, 1000);
+    st->codecpar->codec_type = AVMEDIA_TYPE_SUBTITLE;
+    st->codecpar->codec_id   = AV_CODEC_ID_SRT;
     return 0;
 }
 
@@ -94,7 +94,7 @@ static int srt_read_packet(AVFormatContext *s, AVPacket *pkt)
 
 AVInputFormat ff_srt_demuxer = {
     .name        = "srt",
-    .long_name   = NULL_IF_CONFIG_SMALL("SubRip subtitle format"),
+    .long_name   = NULL_IF_CONFIG_SMALL("SubRip subtitle"),
     .read_probe  = srt_probe,
     .read_header = srt_read_header,
     .read_packet = srt_read_packet,