riff: Move functions around to be covered by appropriate #ifdefs

[ffmpeg] / libavformat / srtdec.c

diff --git a/libavformat/srtdec.c b/libavformat/srtdec.c
index d170f9f8564938a020e959ae9a6c826c4ba90eb3..9db5133a2102c20f00312302621a804a224bf819 100644 (file)
--- a/libavformat/srtdec.c
+++ b/libavformat/srtdec.c
@@ -47,7 +47,7 @@ static int srt_read_header(AVFormatContext *s)
         return -1;
     avpriv_set_pts_info(st, 64, 1, 1000);
     st->codec->codec_type = AVMEDIA_TYPE_SUBTITLE;
-    st->codec->codec_id   = CODEC_ID_SRT;
+    st->codec->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,