X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fffmpeg.C;h=515657867a22e929a0f806ec321bee6c1a63a9ac;hb=3ec3a9cc6afc6561311686b3ec597ee3c1d80d6f;hp=ccf80afcbce0e94590c05696b9a165a73d7e1ec1;hpb=788dfe4aae1aef521caddcc68dec7369a996dce7;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/cinelerra/ffmpeg.C b/cinelerra-5.1/cinelerra/ffmpeg.C index ccf80afc..51565786 100644 --- a/cinelerra-5.1/cinelerra/ffmpeg.C +++ b/cinelerra-5.1/cinelerra/ffmpeg.C @@ -1992,8 +1992,8 @@ void FFMPEG::stop_muxer() if( running() ) { done = 1; mux_lock->unlock(); - join(); } + join(); } void FFMPEG::flow_off()