Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavformat / tta.c

diff --git a/libavformat/tta.c b/libavformat/tta.c
index 2de6f5fbe7568396014cbe34c81419c1a93834f1..1440c8000a0e893246c672948c2f70120f3cdafc 100644 (file)
--- a/libavformat/tta.c
+++ b/libavformat/tta.c
@@ -102,7 +102,7 @@ static int tta_read_header(AVFormatContext *s)
     avio_skip(s->pb, 4); // seektable crc
 
     st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
-    st->codec->codec_id = CODEC_ID_TTA;
+    st->codec->codec_id = AV_CODEC_ID_TTA;
     st->codec->channels = channels;
     st->codec->sample_rate = samplerate;
     st->codec->bits_per_coded_sample = bps;
@@ -160,7 +160,7 @@ static int tta_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp
 
 AVInputFormat ff_tta_demuxer = {
     .name           = "tta",
-    .long_name      = NULL_IF_CONFIG_SMALL("True Audio"),
+    .long_name      = NULL_IF_CONFIG_SMALL("TTA (True Audio)"),
     .priv_data_size = sizeof(TTAContext),
     .read_probe     = tta_probe,
     .read_header    = tta_read_header,