add new boxblur plugin, mods to videoscope, fix segv for menu btns kfrm-tweak/kfrm...

[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 b877c47d938d1ccfb29184c673ceb12116f9da80..92b15794ced82f6f31a2144c87ad78c114564cf4 100644 (file)
--- a/cinelerra-5.1/cinelerra/asset.h
+++ b/cinelerra-5.1/cinelerra/asset.h
@@ -93,6 +93,7 @@ public:
                int expand_relative = 1);
        int read_audio(FileXML *xml);
        int read_video(FileXML *xml);
+       int read_format(FileXML *xml);
        int read_index(FileXML *xml);
        void reset_audio();
        void reset_video();
@@ -146,6 +147,8 @@ public:
 
        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];
 
@@ -182,12 +185,11 @@ public:
        double aspect_ratio;
 
 // for the interlace mode
-       int interlace_autofixoption;
        int interlace_mode;
-       int interlace_fixmethod;
 // for jpeg compression
        int jpeg_quality;
 
+
 // for mpeg video compression
        int vmpeg_iframe_distance;
        int vmpeg_progressive;
@@ -206,18 +208,21 @@ public:
        int vmpeg_field_order;
        int vmpeg_pframe_distance;
 
-// ffmpeg muxer file extension
+// ffmpeg
        char fformat[BCSTRLEN];
+       char ff_format_options[BCTEXTLEN];
        char ff_video_options[BCTEXTLEN];
        char ff_pixel_format[BCSTRLEN];
        int ff_video_bitrate, ff_video_quality;
+       int ff_color_space, ff_color_range;
        char ff_audio_options[BCTEXTLEN];
        char ff_sample_format[BCSTRLEN];
        int ff_audio_bitrate, ff_audio_quality;
 
 // PNG video compression
        int png_use_alpha;
-
+       int png_depth;
+       int png_compression;
 // EXR video compression
        int exr_use_alpha;
        int exr_compression;