aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar aurel <aurel@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-10-21 22:57:42 +0000
committerGravatar aurel <aurel@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-10-21 22:57:42 +0000
commit5340c0c03c2acb5a537e4d619cb075fafd41a41e (patch)
tree8a2fc76061ddb3fe2a2e2c310b1528b1d42fb00c
parent27d76cfaab5be73017183eec8e69f96a4ebcccc8 (diff)
add support for wavpack into matroska
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24833 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--libmpdemux/demux_mkv.c4
-rw-r--r--libmpdemux/matroska.h1
2 files changed, 5 insertions, 0 deletions
diff --git a/libmpdemux/demux_mkv.c b/libmpdemux/demux_mkv.c
index 1215193c75..6bf0dd7d9f 100644
--- a/libmpdemux/demux_mkv.c
+++ b/libmpdemux/demux_mkv.c
@@ -1966,6 +1966,8 @@ demux_mkv_open_audio (demuxer_t *demuxer, mkv_track_t *track, int aid)
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, mkv_track_t *track, int aid)
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 --git a/libmpdemux/matroska.h b/libmpdemux/matroska.h
index 0367925ec8..9efce44d27 100644
--- a/libmpdemux/matroska.h
+++ b/libmpdemux/matroska.h
@@ -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"