]> git.sesse.net Git - ffmpeg/blobdiff - libavformat/voc.c
Merge remote-tracking branch 'qatar/master'
[ffmpeg] / libavformat / voc.c
index 53e02f94647e3db1480099662314aeb4b0886197..2a972344d3b0aedc97ecf529c96843694214451b 100644 (file)
 const unsigned char ff_voc_magic[21] = "Creative Voice File\x1A";
 
 const AVCodecTag ff_voc_codec_tags[] = {
-    {CODEC_ID_PCM_U8,        0x00},
-    {CODEC_ID_ADPCM_SBPRO_4, 0x01},
-    {CODEC_ID_ADPCM_SBPRO_3, 0x02},
-    {CODEC_ID_ADPCM_SBPRO_2, 0x03},
-    {CODEC_ID_PCM_S16LE,     0x04},
-    {CODEC_ID_PCM_ALAW,      0x06},
-    {CODEC_ID_PCM_MULAW,     0x07},
-    {CODEC_ID_ADPCM_CT,    0x0200},
-    {CODEC_ID_NONE,             0},
+    {AV_CODEC_ID_PCM_U8,        0x00},
+    {AV_CODEC_ID_ADPCM_SBPRO_4, 0x01},
+    {AV_CODEC_ID_ADPCM_SBPRO_3, 0x02},
+    {AV_CODEC_ID_ADPCM_SBPRO_2, 0x03},
+    {AV_CODEC_ID_PCM_S16LE,     0x04},
+    {AV_CODEC_ID_PCM_ALAW,      0x06},
+    {AV_CODEC_ID_PCM_MULAW,     0x07},
+    {AV_CODEC_ID_ADPCM_CT,    0x0200},
+    {AV_CODEC_ID_NONE,             0},
 };