Mercurial > audlegacy
changeset 1030:2ed9643e968b trunk
[svn] - fix g_thread_join() spurious call error (also effects 1.0 -- yuck!)
| author | nenolod |
|---|---|
| date | Fri, 12 May 2006 13:47:25 -0700 |
| parents | 54dd4df67688 |
| children | c9e641ff4a28 |
| files | Plugins/Input/aac/src/libmp4.c |
| diffstat | 1 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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;