From 71cfef481fec7d9004632411b2dd6f82b2254c29 Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Mon, 29 Nov 2004 22:33:10 +0000 Subject: [PATCH] Move the MPEG ES detection further back because it is not very precise and misdetects other stuff (e.g. MP3 frames...). --- src/merge/output_control.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/merge/output_control.cpp b/src/merge/output_control.cpp index 6f0b8f372..a3acaae35 100644 --- a/src/merge/output_control.cpp +++ b/src/merge/output_control.cpp @@ -285,8 +285,6 @@ get_file_type(const string &filename) { type = TYPEQTMP4; else if (tta_reader_c::probe_file(mm_io, size)) type = TYPETTA; - else if (mpeg_es_reader_c::probe_file(mm_io, size)) - type = TYPEMPEG; else { for (i = 0; (probe_sizes[i] != 0) && (type == TYPEUNKNOWN); i++) 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; else if (dts_reader_c::probe_file(mm_io, size)) 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; + else if (mpeg_es_reader_c::probe_file(mm_io, size)) + type = TYPEMPEG; else { delete mm_io;