Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2024-12-24 20:01:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move the MPEG ES detection further back because it is not very precise and misdetects other stuff (e.g. MP3 frames...).

Browse Source
This commit is contained in:
Moritz Bunkus 2004-11-29 22:33:10 +00:00
parent be2adf1aba
commit 71cfef481f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/merge/output_control.cpp
View File

@ -285,8 +285,6 @@ get_file_type(const string &filename) {
type = TYPEQTMP4; type = TYPEQTMP4;
else if (tta_reader_c::probe_file(mm_io, size)) else if (tta_reader_c::probe_file(mm_io, size))
type = TYPETTA; type = TYPETTA;
else if (mpeg_es_reader_c::probe_file(mm_io, size))
type = TYPEMPEG;
else { else {
for (i = 0; (probe_sizes[i] != 0) && (type == TYPEUNKNOWN); i++) for (i = 0; (probe_sizes[i] != 0) && (type == TYPEUNKNOWN); i++)
if (mp3_reader_c::probe_file(mm_io, size, probe_sizes[i], 5)) if (mp3_reader_c::probe_file(mm_io, size, probe_sizes[i], 5))
@ -300,8 +298,10 @@ get_file_type(const string &filename) {
type = TYPEMP3; type = TYPEMP3;
else if (dts_reader_c::probe_file(mm_io, size)) else if (dts_reader_c::probe_file(mm_io, size))
type = TYPEDTS; type = TYPEDTS;
else if (aac_reader_c::probe_file(mm_io, size)) else if (aac_reader_c::probe_file(mm_io, size, 2 * 1024 * 1024, 10))
type = TYPEAAC; type = TYPEAAC;
else if (mpeg_es_reader_c::probe_file(mm_io, size))
type = TYPEMPEG;
else { else {
delete mm_io; delete mm_io;