# HG changeset patch # User aurel # Date 1193007462 0 # Node ID ee9619105e9040d7ed08f592088ad4e1cfc32160 # Parent a677b078237125f91c2302d657d64d6d3d1baa83 add support for wavpack into matroska diff -r a677b0782371 -r ee9619105e90 libmpdemux/demux_mkv.c --- a/libmpdemux/demux_mkv.c Sun Oct 21 22:31:22 2007 +0000 +++ b/libmpdemux/demux_mkv.c Sun Oct 21 22:57:42 2007 +0000 @@ -1966,6 +1966,8 @@ 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 @@ 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); diff -r a677b0782371 -r ee9619105e90 libmpdemux/matroska.h --- a/libmpdemux/matroska.h Sun Oct 21 22:31:22 2007 +0000 +++ b/libmpdemux/matroska.h Sun Oct 21 22:57:42 2007 +0000 @@ -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"