Credit Andrew - fix vorbis audio which was scratchy and ensure aging plugin does...

diff --git a/cinelerra-5.1/cinelerra/ffmpeg.C b/cinelerra-5.1/cinelerra/ffmpeg.C
index 8c753a354ee0d99c8faf3e5a1d9af63a9aaab32f..6685f468b205255061c670412dc2108135bf5b83 100644 (file)
--- a/cinelerra-5.1/cinelerra/ffmpeg.C
+++ b/cinelerra-5.1/cinelerra/ffmpeg.C
@@ -641,8 +641,8 @@ int FFStream::encode_frame(AVFrame *frame)
                if ( ret == AVERROR(EAGAIN) && !frame ) continue;
                FFPacket opkt;
                ret = avcodec_receive_packet(avctx, opkt);
-               if( !frame && ret == AVERROR_EOF ) return pkts;
-               if( ret < 0 ) break;
+               if( !frame && (ret == AVERROR_EOF || ret == AVERROR(EAGAIN) )) return pkts;
+               //if( ret < 0 ) break;
                ret = write_packet(opkt);
                if( ret < 0 ) break;
                ++pkts;

diff --git a/cinelerra-5.1/plugins/aging/aging.C b/cinelerra-5.1/plugins/aging/aging.C
index 5517b44da14f800231db31ab0800b203a853bbd9..41d30d75844e2b1cd771878b351a1d49a2ecc540 100644 (file)
--- a/cinelerra-5.1/plugins/aging/aging.C
+++ b/cinelerra-5.1/plugins/aging/aging.C
@@ -581,12 +581,12 @@ void AgingClient::process_package(LoadPackage *package)
                        plugin->input_ptr->get_color_model(),
                        plugin->input_ptr->get_w(),
                        local_package->row2 - local_package->row1);
-       if( plugin->config.pits )
+       if( plugin->config.pits && plugin->config.pits_interval > 0 )
                pits(output_rows,
                        plugin->input_ptr->get_color_model(),
                        plugin->input_ptr->get_w(),
                        local_package->row2 - local_package->row1);
-       if( plugin->config.dust )
+       if( plugin->config.dust && plugin->config.dust_interval > 0 )
                dusts(output_rows,
                        plugin->input_ptr->get_color_model(),
                        plugin->input_ptr->get_w(),

diff --git a/cinelerra-5.1/plugins/aging/agingwindow.C b/cinelerra-5.1/plugins/aging/agingwindow.C
index 5f4007aa15e1cdaf95d6e69a04005f0bcad26a0c..9ccb4d8aac15be402975ba743d06d38c47afa7e5 100644 (file)
--- a/cinelerra-5.1/plugins/aging/agingwindow.C
+++ b/cinelerra-5.1/plugins/aging/agingwindow.C
@@ -82,6 +82,7 @@ AgingISlider::~AgingISlider()
 int AgingISlider::handle_event()
 {
        int ret = BC_ISlider::handle_event();
+       *output = get_value();
        win->plugin->send_configure_change();
        return ret;
 }