rework proxy scaler, fix crop-gui coord, video_data tweak for proxy_format

[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 c853d7adfdc7cae06d2fdeeec749de9fc171ec02..80a29eb5cc33c48b84778abf8ef01679ea71168d 100644 (file)
--- a/cinelerra-5.1/cinelerra/asset.h
+++ b/cinelerra-5.1/cinelerra/asset.h
@@ -146,6 +146,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;

 // String or FourCC describing compression
        char vcodec[BCTEXTLEN];
 
 // String or FourCC describing compression
        char vcodec[BCTEXTLEN];
 


@@ -167,9 +169,7 @@ public:
        double aspect_ratio;
 
 // for the interlace mode
        double aspect_ratio;
 
 // for the interlace mode

-       int interlace_autofixoption;

        int interlace_mode;
        int interlace_mode;

-       int interlace_fixmethod;

 // for jpeg compression
        int jpeg_quality;
 
 // for jpeg compression
        int jpeg_quality;