mirror of
https://gitlab.com/mbunkus/mkvtoolnix.git
synced 2024-12-23 19:31:44 +00:00
Always output native MPEG-4 ASP when reading native MPEP-4 ASP regardless of the --engage native_mpeg4 CL argument.
This commit is contained in:
parent
4e5c9ddc65
commit
56703d4959
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user