diff options
| author | mosu <mosu@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-10-30 08:47:04 +0000 |
|---|---|---|
| committer | mosu <mosu@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-10-30 08:47:04 +0000 |
| commit | 60425413749a2c4a6aa70989215fa5998b2929da (patch) | |
| tree | 2017545db75f5936a4853193a44293dad86e2203 /libmpdemux/demux_mkv.c | |
| parent | 6bc7b343506b3757cd9888d0cab1226147c916c2 (diff) | |
| download | mpv-60425413749a2c4a6aa70989215fa5998b2929da.tar.bz2 mpv-60425413749a2c4a6aa70989215fa5998b2929da.tar.xz | |
DTS uses the format tag 0x2001. Patch by Joakim Plate (joakim ! plate () ecce ! se)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13805 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demux_mkv.c')
| -rw-r--r-- | libmpdemux/demux_mkv.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libmpdemux/demux_mkv.c b/libmpdemux/demux_mkv.c index 3a7f710782..a78edf4c86 100644 --- a/libmpdemux/demux_mkv.c +++ b/libmpdemux/demux_mkv.c @@ -1690,9 +1690,10 @@ demux_mkv_open_audio (demuxer_t *demuxer, mkv_track_t *track) if (!strcmp(track->codec_id, MKV_A_MP3) || !strcmp(track->codec_id, MKV_A_MP2)) track->a_formattag = 0x0055; - else if (!strncmp(track->codec_id, MKV_A_AC3, strlen(MKV_A_AC3)) || - !strcmp(track->codec_id, MKV_A_DTS)) + else if (!strncmp(track->codec_id, MKV_A_AC3, strlen(MKV_A_AC3))) track->a_formattag = 0x2000; + else if (!strcmp(track->codec_id, MKV_A_DTS)) + track->a_formattag = 0x2001; else if (!strcmp(track->codec_id, MKV_A_PCM) || !strcmp(track->codec_id, MKV_A_PCM_BE)) track->a_formattag = 0x0001; @@ -1810,7 +1811,8 @@ demux_mkv_open_audio (demuxer_t *demuxer, mkv_track_t *track) sh_a->wf->nAvgBytesPerSec = 16000; sh_a->wf->nBlockAlign = 1152; } - else if (!strncmp(track->codec_id, MKV_A_AC3, strlen(MKV_A_AC3))) + else if ((track->a_formattag == 0x2000) || /* AC3 */ + (track->a_formattag == 0x2001)) /* DTS */ { sh_a->wf->nAvgBytesPerSec = 16000; sh_a->wf->nBlockAlign = 1536; |