From 56703d4959b59356fb7d52558766137cde7556a0 Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Thu, 25 Aug 2005 09:06:33 +0000 Subject: [PATCH] Always output native MPEG-4 ASP when reading native MPEP-4 ASP regardless of the --engage native_mpeg4 CL argument. --- src/output/p_video.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/output/p_video.cpp b/src/output/p_video.cpp index 5febf7dde..9c2da0be9 100644 --- a/src/output/p_video.cpp +++ b/src/output/p_video.cpp @@ -347,9 +347,8 @@ mpeg4_p2_video_packetizer_c(generic_reader_c *_reader, aspect_ratio_extracted(false), input_is_native(_input_is_native), output_is_native(hack_engaged(ENGAGE_NATIVE_MPEG4)) { - if (input_is_native && !output_is_native) - mxerror("mkvmerge does not support muxing from native MPEG-4 to " - "AVI compatibility mode at the moment.\n"); + if (input_is_native) + output_is_native = true; if (!output_is_native) { set_codec_id(MKV_V_MSCOMP); @@ -587,6 +586,9 @@ void mpeg4_p2_video_packetizer_c::flush_frames(bool end_of_file) { int i; + if (queued_frames.empty()) + return; + if ((available_timecodes.size() < queued_frames.size()) || (available_durations.size() < queued_frames.size())) handle_missing_timecodes(end_of_file);