X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;ds=sidebyside;f=cinelerra-5.1%2Fcinelerra%2Fffmpeg.C;h=515657867a22e929a0f806ec321bee6c1a63a9ac;hb=3ec3a9cc6afc6561311686b3ec597ee3c1d80d6f;hp=64acfe2bdbbd4a1026016eb65f8c1a0ddce033fa;hpb=190b4810ec184c74ceab3fcd6faf09a91c92c53c;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/ffmpeg.C b/cinelerra-5.1/cinelerra/ffmpeg.C
index 64acfe2b..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()
@@ -2502,7 +2502,7 @@ printf("audio%d pad %ld %ld (%ld)\n", aud->idx, pos, aud->curr_pos, pos-aud->cur
 				int got_frame = 0;
 				int ret = aud->decode_frame(&pkt, frame, got_frame);
 				if( ret <= 0 ) break;
-				if( got_frame ) {
+				if( got_frame && frame->channels == nch ) {
 					float *samples;
 					int len = aud->get_samples(samples,
 						 &frame->extended_data[0], frame->nb_samples);