projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
png img proxy fixes, speed zoom segv fix, colapse ins 1frm silence undo, repair rende...
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
assetedit.C
diff --git
a/cinelerra-5.1/cinelerra/assetedit.C
b/cinelerra-5.1/cinelerra/assetedit.C
index 0a417e4bf7175775ec737b7a79e5e3c28445c700..301cf482d94b0e2450acaa9ab6d87ed103340722 100644
(file)
--- a/
cinelerra-5.1/cinelerra/assetedit.C
+++ b/
cinelerra-5.1/cinelerra/assetedit.C
@@
-193,8
+193,8
@@
int AssetEdit::window_height()
h += 210;
if( indexable->is_asset ) {
Asset *asset = (Asset *)indexable;
h += 210;
if( indexable->is_asset ) {
Asset *asset = (Asset *)indexable;
- if(
asset->format == FILE_MPEG ||
-
asset->format == FILE_FFMPEG )
h += 42;
+ if(
File::can_scale_input(asset) )
+
h += 42;
}
}
return h;
}
}
return h;
@@
-498,7
+498,7
@@
void AssetEditWindow::create_objects()
add_subwindow(win_height);
y += win_height->get_h() + 5;
add_subwindow(win_height);
y += win_height->get_h() + 5;
- if( asset &&
(asset->format == FILE_MPEG || asset->format == FILE_FFMPEG )
) {
+ if( asset &&
File::can_scale_input(asset)
) {
y += 5;
x = x1;
add_subwindow(new BC_Title(x, y, _("Actual width:")));
y += 5;
x = x1;
add_subwindow(new BC_Title(x, y, _("Actual width:")));