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

Always output native MPEG-4 ASP when reading native MPEP-4 ASP regardless of the --engage native_mpeg4 CL argument.

Browse Source
This commit is contained in:
Moritz Bunkus 2005-08-25 09:06:33 +00:00
parent 4e5c9ddc65
commit 56703d4959
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/output/p_video.cpp
View File

@ -347,9 +347,8 @@ mpeg4_p2_video_packetizer_c(generic_reader_c *_reader,
aspect_ratio_extracted(false), input_is_native(_input_is_native), aspect_ratio_extracted(false), input_is_native(_input_is_native),
output_is_native(hack_engaged(ENGAGE_NATIVE_MPEG4)) { output_is_native(hack_engaged(ENGAGE_NATIVE_MPEG4)) {
if (input_is_native && !output_is_native) if (input_is_native)
mxerror("mkvmerge does not support muxing from native MPEG-4 to " output_is_native = true;
"AVI compatibility mode at the moment.\n");
if (!output_is_native) { if (!output_is_native) {
set_codec_id(MKV_V_MSCOMP); set_codec_id(MKV_V_MSCOMP);
@ -587,6 +586,9 @@ void
mpeg4_p2_video_packetizer_c::flush_frames(bool end_of_file) { mpeg4_p2_video_packetizer_c::flush_frames(bool end_of_file) {
int i; int i;
if (queued_frames.empty())
return;
if ((available_timecodes.size() < queued_frames.size()) || if ((available_timecodes.size() < queued_frames.size()) ||
(available_durations.size() < queued_frames.size())) (available_durations.size() < queued_frames.size()))
handle_missing_timecodes(end_of_file); handle_missing_timecodes(end_of_file);