From 2df4d1eb5d8fa77d594b2993ba3f6e3a28ca0dd1 Mon Sep 17 00:00:00 2001 From: eumagga0x2a Date: Mon, 7 Sep 2020 00:37:26 +0200 Subject: [PATCH] [muxerMp4] Allow MPEG-1 and MPEG-2 video --- avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp b/avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp index 479619861b..cd12c36743 100644 --- a/avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp +++ b/avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp @@ -84,7 +84,8 @@ bool MOVCLASS::open(const char *file, ADM_videoStream *s, uint32_t nbAudioTrack, { #define FCC_IS_NOT(x) !fourCC::check(fcc,(const uint8_t *)x) uint32_t fcc=s->getFCC(); - if( !isMpeg4Compatible(fcc) && + if( !isMpeg12Compatible(fcc) && + !isMpeg4Compatible(fcc) && !isH264Compatible(fcc) && !isH265Compatible(fcc) && #ifdef MUXER_IS_MOV @@ -100,11 +101,11 @@ bool MOVCLASS::open(const char *file, ADM_videoStream *s, uint32_t nbAudioTrack, #ifdef MUXER_IS_MOV GUI_Error_HIG( QT_TRANSLATE_NOOP("mp4muxer","Unsupported"), - QT_TRANSLATE_NOOP("mp4muxer","Only MP4Video, H264, H265, AV1, DNxHD and ProRes supported for video")); + QT_TRANSLATE_NOOP("mp4muxer","Only MPEG-1/2/4, H264, H265, AV1, DNxHD and ProRes supported for video")); #else GUI_Error_HIG( QT_TRANSLATE_NOOP("mp4muxer","Unsupported"), - QT_TRANSLATE_NOOP("mp4muxer","Only MP4Video, H264, H265 and AV1 supported for video")); + QT_TRANSLATE_NOOP("mp4muxer","Only MPEG-1/2/4, H264, H265 and AV1 supported for video")); #endif return false; }