build fixes/upgrades, bd/ffmpeg/dialog tweaks

[goodguy/history.git] / cinelerra-5.1 / cinelerra / ffmpeg.C

diff --git a/cinelerra-5.1/cinelerra/ffmpeg.C b/cinelerra-5.1/cinelerra/ffmpeg.C
index 31a0d22963afe40587d2871b162267cb9ac00293..172252f694416953d027ac4921987a65b33ca0ef 100644 (file)
--- a/cinelerra-5.1/cinelerra/ffmpeg.C
+++ b/cinelerra-5.1/cinelerra/ffmpeg.C
@@ -427,6 +427,8 @@ int FFStream::write_packet(FFPacket &pkt)
 
 int FFStream::flush()
 {
+       if( writing < 0 )
+               return -1;
        int ret = 0;
        while( ret >= 0 ) {
                FFPacket pkt;
@@ -1839,9 +1841,10 @@ int FFMPEG::open_encoder(const char *type, const char *spec)
                        fst->add_bsfilter(bsfilter, !bsargs[0] ? 0 : bsargs);
        }
 
-       ff_unlock();
        if( !ret )
                start_muxer();
+
+       ff_unlock();
        av_dict_free(&sopts);
        return ret;
 }