fix for Gang Channels/Media

diff --git a/cinelerra-5.1/cinelerra/theme.C b/cinelerra-5.1/cinelerra/theme.C
index 0c364f73d35fd86238312f06ef1ac00c33c9af27..8a667b5c0751b41e2775b6a850fae31a31499087 100644 (file)
--- a/cinelerra-5.1/cinelerra/theme.C
+++ b/cinelerra-5.1/cinelerra/theme.C
@@ -369,6 +369,7 @@ void Theme::build_menus()
        frame_rates.append(new BC_ListBoxItem("100"));
        frame_rates.append(new BC_ListBoxItem("120"));
        frame_rates.append(new BC_ListBoxItem("144"));
+       frame_rates.append(new BC_ListBoxItem("240"));
        frame_rates.append(new BC_ListBoxItem("1000"));
 
        char string[BCTEXTLEN];

diff --git a/cinelerra-5.1/cinelerra/track.C b/cinelerra-5.1/cinelerra/track.C
index 5c07480e249799bbc242512d11764591a357cc6e..aff2b093539cf9877dfb9cd72f4a7ec1d9b6ef28 100644 (file)
--- a/cinelerra-5.1/cinelerra/track.C
+++ b/cinelerra-5.1/cinelerra/track.C
@@ -1836,20 +1836,22 @@ int Track::in_gang(Track *track)
 
 int Track::is_armed()
 {
-       return armed && gang_master()->armed;
+//     return armed && gang_master()->armed;
+       return gang_master()->armed;
 }
 
 int Track::is_ganged()
 {
-       return ganged && gang_master()->ganged;
+//     return ganged && gang_master()->ganged;
+       return gang_master()->ganged;
 }
 
 int Track::armed_gang(Track *track)
 {
-       if( !track->ganged ) return 0;
+//     if( !track->ganged ) return 0;
        if( edl->local_session->gang_tracks == GANG_NONE ) return ganged;
        Track *current = gang_master();
-       if( !current->ganged ) return 0;
+//     if( !current->ganged ) return 0;
        for(;;) {
                if( track == current ) return 1;
                current = current->next;

diff --git a/cinelerra-5.1/ffmpeg/video/av1.webm b/cinelerra-5.1/ffmpeg/video/av1.webm
index d5e642bbee081fc7d793021f82343e642a423aff..d8306db8ef9796b5e57abfaf012a30217f37bc40 100644 (file)
--- a/cinelerra-5.1/ffmpeg/video/av1.webm
+++ b/cinelerra-5.1/ffmpeg/video/av1.webm
@@ -2,5 +2,8 @@ webm libaom-av1
 # this codec codes less than one frame per sec
 # and so even a few seconds of video can take
 # a very long time to encode
+cpu-used 5
+row-mt 1
+tiles 2x2
 strict -2
 threads 8