# HG changeset patch
# User nenolod
# Date 1147466845 25200
# Node ID 2ed9643e968be1d11c9409af4e1ecd837287a3f9
# Parent  54dd4df67688453ca5cbdd6d28db74855088dabd
[svn] - fix g_thread_join() spurious call error (also effects 1.0 -- yuck!)

diff -r 54dd4df67688 -r 2ed9643e968b Plugins/Input/aac/src/libmp4.c
--- a/Plugins/Input/aac/src/libmp4.c	Fri May 12 06:48:55 2006 -0700
+++ b/Plugins/Input/aac/src/libmp4.c	Fri May 12 13:47:25 2006 -0700
@@ -391,7 +391,6 @@
 
 			return FALSE;
 		}
-//		duration= mp4ff_get_track_duration(mp4file, mp4track);
 		numSamples = mp4ff_num_samples(mp4file, mp4track);
 		msDuration = ((float)numSamples * (float)(framesize - 1.0)/(float)samplerate) * 1000;
 		mp4_ip.output->open_audio(FMT_S16_NE, samplerate, channels);
@@ -429,6 +428,8 @@
 				mp4_ip.output->close_audio();
 				faacDecClose(decoder);
 
+				buffer_playing = FALSE;
+
 				return FALSE;
 			}
 			rc= mp4ff_read_sample(mp4file, mp4track, 
@@ -437,7 +438,7 @@
 			/*g_print(":: %d/%d\n", sampleID-1, numSamples);*/
 
 			/* If we can't read the file, we're done. */
-			if((!rc) || (buffer== NULL)){
+			if((rc == 0) || (buffer== NULL)){
 				g_print("MP4: read error\n");
 				sampleBuffer = NULL;
 				sampleID=0;