projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
apply contrib scale plugin rework
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
filempeg.C
diff --git
a/cinelerra-5.1/cinelerra/filempeg.C
b/cinelerra-5.1/cinelerra/filempeg.C
index bd8da56ba95d07fef27bc697995b505357571d8b..fb4ee731d05c868f41d25fd307b60b9aecdf0109 100644
(file)
--- 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
{
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
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(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" : "");
}
append_vcommand_line(asset->vmpeg_derivative == 1 ? "-1" : "");