Merge commit '91894f27dce531c13d7e1be20253877f2e1e9e66'

[ffmpeg] / libavformat / rtpdec.c

diff --git a/libavformat/rtpdec.c b/libavformat/rtpdec.c
index 5875905c5451c1034b34385d038411c01274327a..2227e23dce963868be32ddc9bab7bbd6b71ae5be 100644 (file)
--- a/libavformat/rtpdec.c
+++ b/libavformat/rtpdec.c
@@ -59,7 +59,7 @@ static RTPDynamicProtocolHandler opus_dynamic_handler = {
 static RTPDynamicProtocolHandler t140_dynamic_handler = { /* RFC 4103 */
     .enc_name   = "t140",
     .codec_type = AVMEDIA_TYPE_SUBTITLE,
-    .codec_id   = AV_CODEC_ID_SUBRIP,
+    .codec_id   = AV_CODEC_ID_TEXT,
 };
 
 static RTPDynamicProtocolHandler *rtp_first_dynamic_payload_handler = NULL;
@@ -852,7 +852,7 @@ int ff_parse_fmtp(AVFormatContext *s,
                   int (*parse_fmtp)(AVFormatContext *s,
                                     AVStream *stream,
                                     PayloadContext *data,
-                                    char *attr, char *value))
+                                    const char *attr, const char *value))
 {
     char attr[256];
     char *value;