Factor tag reading code out of wav read_header()

[ffmpeg] / libavformat / daud.c

diff --git a/libavformat/daud.c b/libavformat/daud.c
index c0626dfb240c7d8f90f0e8e6dffa2c923e0be3a9..9b0e00834725e184d2faeb9cbe1076bcbc588753 100644 (file)
--- a/libavformat/daud.c
+++ b/libavformat/daud.c
@@ -24,14 +24,14 @@ static int daud_header(AVFormatContext *s, AVFormatParameters *ap) {
     AVStream *st = av_new_stream(s, 0);
     if (!st)
         return AVERROR(ENOMEM);
-    st->codec->codec_type = CODEC_TYPE_AUDIO;
+    st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
     st->codec->codec_id = CODEC_ID_PCM_S24DAUD;
     st->codec->codec_tag = MKTAG('d', 'a', 'u', 'd');
     st->codec->channels = 6;
     st->codec->sample_rate = 96000;
     st->codec->bit_rate = 3 * 6 * 96000 * 8;
     st->codec->block_align = 3 * 6;
-    st->codec->bits_per_sample = 24;
+    st->codec->bits_per_coded_sample = 24;
     return 0;
 }
 
@@ -78,7 +78,7 @@ AVInputFormat daud_demuxer = {
 };
 #endif
 
-#ifdef CONFIG_DAUD_MUXER
+#if CONFIG_DAUD_MUXER
 AVOutputFormat daud_muxer =
 {
     "daud",