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

Set the CodecID properly if native MPEG4 is wanted.

Browse Source
This commit is contained in:
Moritz Bunkus 2005-01-10 09:18:23 +00:00
parent f4351b2213
commit a8768a28e0
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/output/p_video.cpp
View File

@ -75,19 +75,17 @@ video_packetizer_c::video_packetizer_c(generic_reader_c *nreader,
}
if ((mpeg_video == MPEG_VIDEO_NONE) && (ncodec_id != NULL) &&
(!strcmp(ncodec_id, "V_MPEG1") || !strcmp(ncodec_id, "V_MPEG2")))
(!strcmp(ncodec_id, MKV_V_MPEG1) || !strcmp(ncodec_id, MKV_V_MPEG2)))
mpeg_video = (ncodec_id[6] == '1') ? MPEG_VIDEO_V1 : MPEG_VIDEO_V2;
if (ncodec_id != NULL)
if ((mpeg_video == MPEG_VIDEO_V4_LAYER_2) &&
hack_engaged(ENGAGE_NATIVE_MPEG4))
set_codec_id(MKV_V_MPEG4_ASP);
else if (ncodec_id != NULL)
set_codec_id(ncodec_id);
else if ((mpeg_video == MPEG_VIDEO_V4_LAYER_2) &&
hack_engaged(ENGAGE_NATIVE_MPEG4)) {
if (bframes)
set_codec_id(MKV_V_MPEG4_ASP);
else
set_codec_id(MKV_V_MPEG4_SP);
} else
else
set_codec_id(MKV_V_MSCOMP);
if (((mpeg_video != MPEG_VIDEO_V4_LAYER_2) ||
!hack_engaged(ENGAGE_NATIVE_MPEG4)) &&
(hcodec_id != "") && (hcodec_id == MKV_V_MSCOMP) &&