[MPlayer-cvslog] r24833 - in trunk/libmpdemux: demux_mkv.c matroska.h

[aurel]

Author: aurel
Date: Mon Oct 22 00:57:42 2007
New Revision: 24833

Log:
add support for wavpack into matroska

Modified:
   trunk/libmpdemux/demux_mkv.c
   trunk/libmpdemux/matroska.h

Modified: trunk/libmpdemux/demux_mkv.c
==============================================================================
--- trunk/libmpdemux/demux_mkv.c	(original)
+++ trunk/libmpdemux/demux_mkv.c	Mon Oct 22 00:57:42 2007
@@ -1966,6 +1966,8 @@ demux_mkv_open_audio (demuxer_t *demuxer
         track->a_formattag = mmioFOURCC('Q', 'D', 'M', 'C');
       else if (!strcmp(track->codec_id, MKV_A_QDMC2))
         track->a_formattag = mmioFOURCC('Q', 'D', 'M', '2');
+      else if (!strcmp(track->codec_id, MKV_A_WAVPACK))
+        track->a_formattag = mmioFOURCC('W', 'V', 'P', 'K');
       else if (!strcmp(track->codec_id, MKV_A_FLAC))
         {
           if (track->private_data == NULL || track->private_size == 0)
@@ -2205,6 +2207,8 @@ demux_mkv_open_audio (demuxer_t *demuxer
       dp->flags = 0;
       ds_add_packet (demuxer->audio, dp);
     }
+  else if (track->a_formattag == mmioFOURCC('W', 'V', 'P', 'K'))
+    {  /* do nothing, still works */  }
   else if (!track->ms_compat || (track->private_size < sizeof(WAVEFORMATEX)))
     {
       free_sh_audio(demuxer, track->tnum);

Modified: trunk/libmpdemux/matroska.h
==============================================================================
--- trunk/libmpdemux/matroska.h	(original)
+++ trunk/libmpdemux/matroska.h	Mon Oct 22 00:57:42 2007
@@ -33,6 +33,7 @@
 #define MKV_A_QDMC       "A_QUICKTIME/QDMC"
 #define MKV_A_QDMC2      "A_QUICKTIME/QDM2"
 #define MKV_A_FLAC       "A_FLAC"
+#define MKV_A_WAVPACK    "A_WAVPACK4"
 
 #define MKV_V_MSCOMP     "V_MS/VFW/FOURCC"
 #define MKV_V_REALV10    "V_REAL/RV10"