Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavformat / westwood_vqa.c

diff --git a/libavformat/westwood_vqa.c b/libavformat/westwood_vqa.c
index 89a985605ec18e47eee1708bbb9f09f7a8458f8f..708f3e5fc382902bb250218fc2f30a61bfa9b697 100644 (file)
--- a/libavformat/westwood_vqa.c
+++ b/libavformat/westwood_vqa.c
@@ -94,7 +94,7 @@ static int wsvqa_read_header(AVFormatContext *s)
     st->start_time = 0;
     wsvqa->video_stream_index = st->index;
     st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
-    st->codec->codec_id = CODEC_ID_WS_VQA;
+    st->codec->codec_id = AV_CODEC_ID_WS_VQA;
     st->codec->codec_tag = 0;  /* no fourcc */
 
     /* skip to the start of the VQA header */
@@ -211,15 +211,15 @@ static int wsvqa_read_packet(AVFormatContext *s,
                     switch (chunk_type) {
                     case SND0_TAG:
                         if (wsvqa->bps == 16)
-                            st->codec->codec_id = CODEC_ID_PCM_S16LE;
+                            st->codec->codec_id = AV_CODEC_ID_PCM_S16LE;
                         else
-                            st->codec->codec_id = CODEC_ID_PCM_U8;
+                            st->codec->codec_id = AV_CODEC_ID_PCM_U8;
                         break;
                     case SND1_TAG:
-                        st->codec->codec_id = CODEC_ID_WESTWOOD_SND1;
+                        st->codec->codec_id = AV_CODEC_ID_WESTWOOD_SND1;
                         break;
                     case SND2_TAG:
-                        st->codec->codec_id = CODEC_ID_ADPCM_IMA_WS;
+                        st->codec->codec_id = AV_CODEC_ID_ADPCM_IMA_WS;
                         st->codec->extradata_size = 2;
                         st->codec->extradata = av_mallocz(2 + FF_INPUT_BUFFER_PADDING_SIZE);
                         if (!st->codec->extradata)