# HG changeset patch
# User aurel
# Date 1217896969 0
# Node ID 494a55f131f3c1a186b6f0bfb34dc08faba4f6c3
# Parent  03df0b5927ff9df10b8401dc1c912851c8c2d3a5
matroska: expand useless define for MS compat codec id strings

diff -r 03df0b5927ff -r 494a55f131f3 matroska.h
--- a/matroska.h	Tue Aug 05 00:42:46 2008 +0000
+++ b/matroska.h	Tue Aug 05 00:42:49 2008 +0000
@@ -203,9 +203,6 @@
     enum CodecID id;
 }CodecMime;
 
-#define MATROSKA_CODEC_ID_VIDEO_VFW_FOURCC   "V_MS/VFW/FOURCC"
-#define MATROSKA_CODEC_ID_AUDIO_ACM          "A_MS/ACM"
-
 /* max. depth in the EBML tree structure */
 #define EBML_MAX_DEPTH 16
 
diff -r 03df0b5927ff -r 494a55f131f3 matroskadec.c
--- a/matroskadec.c	Tue Aug 05 00:42:46 2008 +0000
+++ b/matroskadec.c	Tue Aug 05 00:42:49 2008 +0000
@@ -1138,12 +1138,12 @@
         if (st == NULL)
             return AVERROR(ENOMEM);
 
-        if (!strcmp(track->codec_id, MATROSKA_CODEC_ID_VIDEO_VFW_FOURCC)
+        if (!strcmp(track->codec_id, "V_MS/VFW/FOURCC")
             && track->codec_priv.size >= 40
             && track->codec_priv.data != NULL) {
             track->video.fourcc = AV_RL32(track->codec_priv.data + 16);
             codec_id = codec_get_id(codec_bmp_tags, track->video.fourcc);
-        } else if (!strcmp(track->codec_id, MATROSKA_CODEC_ID_AUDIO_ACM)
+        } else if (!strcmp(track->codec_id, "A_MS/ACM")
                    && track->codec_priv.size >= 18
                    && track->codec_priv.data != NULL) {
             uint16_t tag = AV_RL16(track->codec_priv.data);
diff -r 03df0b5927ff -r 494a55f131f3 matroskaenc.c
--- a/matroskaenc.c	Tue Aug 05 00:42:46 2008 +0000
+++ b/matroskaenc.c	Tue Aug 05 00:42:49 2008 +0000
@@ -587,7 +587,7 @@
                     put_ebml_string(pb, MATROSKA_ID_CODECID, "V_QUICKTIME");
                 else if (!native_id)
                     // if there is no mkv-specific codec ID, use VFW mode
-                    put_ebml_string(pb, MATROSKA_ID_CODECID, MATROSKA_CODEC_ID_VIDEO_VFW_FOURCC);
+                    put_ebml_string(pb, MATROSKA_ID_CODECID, "V_MS/VFW/FOURCC");
 
                 subinfo = start_ebml_master(pb, MATROSKA_ID_TRACKVIDEO, 0);
                 // XXX: interlace flag?
@@ -607,7 +607,7 @@
 
                 if (!native_id)
                     // no mkv-specific ID, use ACM mode
-                    put_ebml_string(pb, MATROSKA_ID_CODECID, MATROSKA_CODEC_ID_AUDIO_ACM);
+                    put_ebml_string(pb, MATROSKA_ID_CODECID, "A_MS/ACM");
 
                 subinfo = start_ebml_master(pb, MATROSKA_ID_TRACKAUDIO, 0);
                 put_ebml_uint  (pb, MATROSKA_ID_AUDIOCHANNELS    , codec->channels);