X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fffmpeg.C;h=511d37dd58944ea94f5f001c84639fb88083216a;hb=ea0dfe3cd57bb60ef824cd0d3512fcd251020c76;hp=63a1196a2cd8b9bd0ee5c45127ff69b61d900eb1;hpb=689228697484138300ce427a680d69f2e44595c3;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/ffmpeg.C b/cinelerra-5.1/cinelerra/ffmpeg.C
index 63a1196a..511d37dd 100644
--- a/cinelerra-5.1/cinelerra/ffmpeg.C
+++ b/cinelerra-5.1/cinelerra/ffmpeg.C
@@ -33,6 +33,7 @@
 #define AUDIO_INBUF_SIZE 0x10000
 #define VIDEO_REFILL_THRESH 0
 #define AUDIO_REFILL_THRESH 0x1000
+#define AUDIO_MIN_FRAME_SZ 128
 
 Mutex FFMPEG::fflock("FFMPEG::fflock");
 
@@ -588,6 +589,7 @@ FFAudioStream::FFAudioStream(FFMPEG *ffmpeg, AVStream *strm, int idx, int fidx)
 	channel0 = channels = 0;
 	sample_rate = 0;
 	mbsz = 0;
+	frame_sz = AUDIO_MIN_FRAME_SZ;
 	length = 0;
 	resample_context = 0;
 	swr_ichs = swr_ifmt = swr_irate = 0;
@@ -2113,7 +2115,8 @@ int FFMPEG::decode_activate()
 				if( st->start_time == AV_NOPTS_VALUE ) continue;
 				int vidx = ffvideo.size();
 				while( --vidx >= 0 && ffvideo[vidx]->fidx != i );
-				if( vidx >= 0 && ffvideo[vidx]->nudge != AV_NOPTS_VALUE ) continue;
+				if( vidx < 0 ) continue;
+				if( ffvideo[vidx]->nudge != AV_NOPTS_VALUE ) continue;
 				if( vstart_time < st->start_time )
 					vstart_time = st->start_time;
 				break; }
@@ -2121,11 +2124,12 @@ int FFMPEG::decode_activate()
 				if( st->start_time == AV_NOPTS_VALUE ) continue;
 				int aidx = ffaudio.size();
 				while( --aidx >= 0 && ffaudio[aidx]->fidx != i );
-				if( aidx >= 0 && ffaudio[aidx]->nudge != AV_NOPTS_VALUE ) continue;
+				if( aidx < 0 ) continue;
+				if( ffaudio[aidx]->frame_sz < avpar->frame_size )
+					ffaudio[aidx]->frame_sz = avpar->frame_size;
+				if( ffaudio[aidx]->nudge != AV_NOPTS_VALUE ) continue;
 				if( astart_time < st->start_time )
 					astart_time = st->start_time;
-				ffaudio[aidx]->frame_sz =
-					avpar->frame_size < 128 ? 128 : avpar->frame_size;
 				break; }
 			default: break;
 			}