projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix edl break created by creating a clip in open edl edit mode
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
asset.h
diff --git
a/cinelerra-5.1/cinelerra/asset.h
b/cinelerra-5.1/cinelerra/asset.h
index 92b15794ced82f6f31a2144c87ad78c114564cf4..ce922c22c1e61aaed9c35a73f0a348d975b74527 100644
(file)
--- a/
cinelerra-5.1/cinelerra/asset.h
+++ b/
cinelerra-5.1/cinelerra/asset.h
@@
-147,8
+147,8
@@
public:
int actual_width, actual_height;
int width, height;
int actual_width, actual_height;
int width, height;
-// scale factor or 0 if not proxy
- int proxy_scale;
+// scale factor or 0 if not proxy
, proxy_edl if proxyed from nested_edl
+ int proxy_scale
, proxy_edl
;
// String or FourCC describing compression
char vcodec[BCTEXTLEN];
// String or FourCC describing compression
char vcodec[BCTEXTLEN];