Replace all CODEC_ID_* with AV_CODEC_ID_*

[ffmpeg] / libavformat / caf.c

diff --git a/libavformat/caf.c b/libavformat/caf.c
index c204c90ad19cca229017b6f3556848b2a46fc1e9..cf128d56242e1c4585a705afe887e4afc53ee67c 100644 (file)
--- a/libavformat/caf.c
+++ b/libavformat/caf.c
@@ -32,27 +32,27 @@
  * Known codec tags for CAF
  */
 const AVCodecTag ff_codec_caf_tags[] = {
-    { CODEC_ID_AAC,             MKBETAG('a','a','c',' ') },
-    { CODEC_ID_AC3,             MKBETAG('a','c','-','3') },
-    { CODEC_ID_ALAC,            MKBETAG('a','l','a','c') },
+    { AV_CODEC_ID_AAC,             MKBETAG('a','a','c',' ') },
+    { AV_CODEC_ID_AC3,             MKBETAG('a','c','-','3') },
+    { AV_CODEC_ID_ALAC,            MKBETAG('a','l','a','c') },
   /* FIXME: use DV demuxer, as done in MOV */
-  /*{ CODEC_ID_DVAUDIO,         MKBETAG('v','d','v','a') },*/
-  /*{ CODEC_ID_DVAUDIO,         MKBETAG('d','v','c','a') },*/
-    { CODEC_ID_ADPCM_IMA_QT,    MKBETAG('i','m','a','4') },
-    { CODEC_ID_MACE3,           MKBETAG('M','A','C','3') },
-    { CODEC_ID_MACE6,           MKBETAG('M','A','C','6') },
-    { CODEC_ID_MP3,             MKBETAG('.','m','p','3') },
-    { CODEC_ID_MP2,             MKBETAG('.','m','p','2') },
-    { CODEC_ID_MP1,             MKBETAG('.','m','p','1') },
-    { CODEC_ID_PCM_ALAW,        MKBETAG('a','l','a','w') },
-    { CODEC_ID_PCM_MULAW,       MKBETAG('u','l','a','w') },
-    { CODEC_ID_QCELP,           MKBETAG('Q','c','l','p') },
-    { CODEC_ID_QDM2,            MKBETAG('Q','D','M','2') },
-    { CODEC_ID_QDM2,            MKBETAG('Q','D','M','C') },
+  /*{ AV_CODEC_ID_DVAUDIO,         MKBETAG('v','d','v','a') },*/
+  /*{ AV_CODEC_ID_DVAUDIO,         MKBETAG('d','v','c','a') },*/
+    { AV_CODEC_ID_ADPCM_IMA_QT,    MKBETAG('i','m','a','4') },
+    { AV_CODEC_ID_MACE3,           MKBETAG('M','A','C','3') },
+    { AV_CODEC_ID_MACE6,           MKBETAG('M','A','C','6') },
+    { AV_CODEC_ID_MP3,             MKBETAG('.','m','p','3') },
+    { AV_CODEC_ID_MP2,             MKBETAG('.','m','p','2') },
+    { AV_CODEC_ID_MP1,             MKBETAG('.','m','p','1') },
+    { AV_CODEC_ID_PCM_ALAW,        MKBETAG('a','l','a','w') },
+    { AV_CODEC_ID_PCM_MULAW,       MKBETAG('u','l','a','w') },
+    { AV_CODEC_ID_QCELP,           MKBETAG('Q','c','l','p') },
+    { AV_CODEC_ID_QDM2,            MKBETAG('Q','D','M','2') },
+    { AV_CODEC_ID_QDM2,            MKBETAG('Q','D','M','C') },
   /* currently unsupported codecs */
   /*{ AC-3 over S/PDIF          MKBETAG('c','a','c','3') },*/
   /*{ MPEG4CELP                 MKBETAG('c','e','l','p') },*/
   /*{ MPEG4HVXC                 MKBETAG('h','v','x','c') },*/
   /*{ MPEG4TwinVQ               MKBETAG('t','w','v','q') },*/
-    { CODEC_ID_NONE,            0 },
+    { AV_CODEC_ID_NONE,            0 },
 };