Merge commit 'f154ef1ae5b03f288dd8c025dab1884b4cb20c1a'

[ffmpeg] / libavformat / srtenc.c

diff --git a/libavformat/srtenc.c b/libavformat/srtenc.c
index b8fc8fac7e12103a8a0318d54168ca17062efab8..7fe559f487a4eb4f4710421c57dd3c78fc940afb 100644 (file)
--- a/libavformat/srtenc.c
+++ b/libavformat/srtenc.c
@@ -41,8 +41,8 @@ static int srt_write_header(AVFormatContext *avf)
                "SRT supports only a single subtitles stream.\n");
         return AVERROR(EINVAL);
     }
-    if (avf->streams[0]->codec->codec_id != CODEC_ID_TEXT &&
-        avf->streams[0]->codec->codec_id != CODEC_ID_SRT) {
+    if (avf->streams[0]->codec->codec_id != AV_CODEC_ID_TEXT &&
+        avf->streams[0]->codec->codec_id != AV_CODEC_ID_SRT) {
         av_log(avf, AV_LOG_ERROR,
                "Unsupported subtitles codec: %s\n",
                avcodec_get_name(avf->streams[0]->codec->codec_id));
@@ -55,7 +55,7 @@ static int srt_write_header(AVFormatContext *avf)
 static int srt_write_packet(AVFormatContext *avf, AVPacket *pkt)
 {
     SRTContext *srt = avf->priv_data;
-    int write_ts = avf->streams[0]->codec->codec_id != CODEC_ID_SRT;
+    int write_ts = avf->streams[0]->codec->codec_id != AV_CODEC_ID_SRT;
 
     srt->index++;
     if (write_ts) {
@@ -88,12 +88,12 @@ static int srt_write_packet(AVFormatContext *avf, AVPacket *pkt)
 
 AVOutputFormat ff_srt_muxer = {
     .name           = "srt",
-    .long_name      = NULL_IF_CONFIG_SMALL("SubRip subtitle format"),
+    .long_name      = NULL_IF_CONFIG_SMALL("SubRip subtitle"),
     .mime_type      = "application/x-subrip",
     .extensions     = "srt",
     .priv_data_size = sizeof(SRTContext),
     .write_header   = srt_write_header,
     .write_packet   = srt_write_packet,
     .flags          = AVFMT_VARIABLE_FPS,
-    .subtitle_codec = CODEC_ID_TEXT,
+    .subtitle_codec = AV_CODEC_ID_TEXT,
 };