Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2025-02-26 08:22:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use MPEG audio packetizer for MP2 audio instead of the passthrough packetizer

Browse Source
This commit is contained in:
Moritz Bunkus 2010-06-10 15:22:52 +02:00
parent c98ee6e68c
commit 5b99cb381d
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -11,6 +11,9 @@
2010-06-10 Moritz Bunkus <moritz@bunkus.org>
* mkvmerge: bug fix: The Matroska reader will use the MPEG audio
packetizer for MP2 tracks instead of the passthrough packetizer.
* mkvmerge: bug fix: The Matroska reader did not handle compressed
tracks correctly if the passthrough packetizer was used.

1
src/common/matroska.h
View File

@ -30,6 +30,7 @@
#define MKV_A_AC3 "A_AC3"
#define MKV_A_EAC3 "A_EAC3"
#define MKV_A_DTS "A_DTS"
#define MKV_A_MP2 "A_MPEG/L2"
#define MKV_A_MP3 "A_MPEG/L3"
#define MKV_A_PCM "A_PCM/INT/LIT"
#define MKV_A_PCM_BE "A_PCM/INT/BIG"

2
src/input/r_matroska.cpp
View File

@ -351,7 +351,7 @@ kax_reader_c::verify_audio_track(kax_track_t *t) {
bool is_ok = true;
if (t->codec_id == MKV_A_ACM)
is_ok = verify_acm_audio_track(t);
else if (starts_with(t->codec_id, MKV_A_MP3, strlen(MKV_A_MP3) - 1))
else if ((t->codec_id == MKV_A_MP3) || (t->codec_id == MKV_A_MP2))
t->a_formattag = 0x0055;
else if (starts_with(t->codec_id, MKV_A_AC3, strlen(MKV_A_AC3)) || (t->codec_id == MKV_A_EAC3))
t->a_formattag = 0x2000;