projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
es.po update by rafa, add ms win10 cygwin port, add pulseaudio, new config flags...
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
formattools.C
diff --git
a/cinelerra-5.1/cinelerra/formattools.C
b/cinelerra-5.1/cinelerra/formattools.C
index 2bf178ab8927d3b670e61defb7a502df38dade41..0979dfa46f7d22a956e7ac9bc5bc0f81386dfaa6 100644
(file)
--- a/
cinelerra-5.1/cinelerra/formattools.C
+++ b/
cinelerra-5.1/cinelerra/formattools.C
@@
-388,7
+388,8
@@
void FormatTools::update_extension()
char *ptr1 = ptr;
// change "qt" to "mov" since ffmpeg does not know qt
extension_ptr = asset->format != FILE_FFMPEG ? extensions.get(0) :
char *ptr1 = ptr;
// change "qt" to "mov" since ffmpeg does not know qt
extension_ptr = asset->format != FILE_FFMPEG ? extensions.get(0) :
- !strcmp(asset->fformat, "qt") ? "mov" : asset->fformat ;
+ !strcmp(asset->fformat, "qt" ) ||
+ !strcmp(asset->fformat, "pro" ) ? "mov" : asset->fformat ;
while(*extension_ptr != 0 && *extension_ptr != '/')
*ptr1++ = *extension_ptr++;
*ptr1 = 0;
while(*extension_ptr != 0 && *extension_ptr != '/')
*ptr1++ = *extension_ptr++;
*ptr1 = 0;
@@
-465,6
+466,10
@@
void FormatTools::reposition_window(int &init_x, int &init_y)
format_text->reposition_window(x, y);
x += format_text->get_w();
format_button->reposition_window(x, y);
format_text->reposition_window(x, y);
x += format_text->get_w();
format_button->reposition_window(x, y);
+ x += format_button->get_w() + 5;
+ ffmpeg_type->reposition_window(x, y);
+ x += ffmpeg_type->get_w();
+ format_ffmpeg->reposition_window(x, y);
x = init_x;
y += format_button->get_h() + ys10;
x = init_x;
y += format_button->get_h() + ys10;