X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Ffilempeg.C;h=c728036ae52604364c7093dde59c763b4ba2e833;hb=b5905b17fc54178b60f847c6558523952c4b3bd4;hp=bd8da56ba95d07fef27bc697995b505357571d8b;hpb=3eaa47aa60ab4347058a6c22afc95a003f6fdade;p=goodguy%2Fcinelerra.git diff --git a/cinelerra-5.1/cinelerra/filempeg.C b/cinelerra-5.1/cinelerra/filempeg.C index bd8da56b..c728036a 100644 --- a/cinelerra-5.1/cinelerra/filempeg.C +++ b/cinelerra-5.1/cinelerra/filempeg.C @@ -501,10 +501,6 @@ int FileMPEG::open_file(int rd, int wr) { append_vcommand_line("-a"); // Square pixels - if(EQUIV((double)asset->width / asset->height, - asset->aspect_ratio)) - append_vcommand_line("1"); - else if(EQUIV(asset->aspect_ratio, 1.333)) append_vcommand_line("2"); else @@ -513,6 +509,10 @@ int FileMPEG::open_file(int rd, int wr) else if(EQUIV(asset->aspect_ratio, 2.11)) append_vcommand_line("4"); + else + if(EQUIV((double)asset->width / asset->height, + asset->aspect_ratio)) + append_vcommand_line("1"); } append_vcommand_line(asset->vmpeg_derivative == 1 ? "-1" : ""); @@ -1727,6 +1727,8 @@ MPEGConfigAudio::MPEGConfigAudio(BC_WindowBase *parent_window, Asset *asset) { this->parent_window = parent_window; this->asset = asset; +// *** CONTEXT_HELP *** + context_help_set_keyword("Single File Rendering"); } MPEGConfigAudio::~MPEGConfigAudio() @@ -1881,6 +1883,8 @@ MPEGConfigVideo::MPEGConfigVideo(BC_WindowBase *parent_window, this->parent_window = parent_window; this->asset = asset; reset_cmodel(); +// *** CONTEXT_HELP *** + context_help_set_keyword("Single File Rendering"); } MPEGConfigVideo::~MPEGConfigVideo()