Merge commit 'f154ef1ae5b03f288dd8c025dab1884b4cb20c1a'

[ffmpeg] / libavformat / caf.c

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