Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

[ffmpeg] / libavformat / westwood_aud.c

diff --git a/libavformat/westwood_aud.c b/libavformat/westwood_aud.c
index 6dee8b535f20bc32850446ef25ce6c2795ce5a7f..2762cba405b0eb76a898396b40c1546d19ed883b 100644 (file)
--- a/libavformat/westwood_aud.c
+++ b/libavformat/westwood_aud.c
@@ -106,10 +106,10 @@ static int wsaud_read_header(AVFormatContext *s)
             av_log_ask_for_sample(s, "Stereo WS-SND1 is not supported.\n");
             return AVERROR_PATCHWELCOME;
         }
-        st->codec->codec_id = CODEC_ID_WESTWOOD_SND1;
+        st->codec->codec_id = AV_CODEC_ID_WESTWOOD_SND1;
         break;
     case 99:
-        st->codec->codec_id = CODEC_ID_ADPCM_IMA_WS;
+        st->codec->codec_id = AV_CODEC_ID_ADPCM_IMA_WS;
         st->codec->bits_per_coded_sample = 4;
         st->codec->bit_rate = channels * sample_rate * 4;
         break;
@@ -144,7 +144,7 @@ static int wsaud_read_packet(AVFormatContext *s,
 
     chunk_size = AV_RL16(&preamble[0]);
 
-    if (st->codec->codec_id == CODEC_ID_WESTWOOD_SND1) {
+    if (st->codec->codec_id == AV_CODEC_ID_WESTWOOD_SND1) {
         /* For Westwood SND1 audio we need to add the output size and input
            size to the start of the packet to match what is in VQA.
            Specifically, this is needed to signal when a packet should be