[Swfdec-commits] 2 commits - autogen.sh swfdec/swfdec_audio_flv.c

[Benjamin Otte]

 autogen.sh                |    2 +-
 swfdec/swfdec_audio_flv.c |    5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit ab5f00a93f7c031f29b5c4729cab2b7bdf3cd3a1
Author: Riccardo Magliocchetti <riccardo at datahost.it>
Date:   Sun May 25 11:05:21 2008 +0200

    remove reference to ffmpeg in autogen.sh

diff --git a/autogen.sh b/autogen.sh
index efac6c5..e677a64 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 autoreconf -i -f &&
-./configure --disable-static --enable-gtk-doc --enable-vivified --enable-ffmpeg $@
+./configure --disable-static --enable-gtk-doc --enable-vivified $@
commit b9ba04b7897576dd3c2649522866901052e1b61c
Author: Riccardo Magliocchetti <riccardo at datahost.it>
Date:   Sun May 25 10:59:58 2008 +0200

    make the render function similar to swfdec_audio_stream_render

diff --git a/swfdec/swfdec_audio_flv.c b/swfdec/swfdec_audio_flv.c
index 2780185..b060d74 100644
--- a/swfdec/swfdec_audio_flv.c
+++ b/swfdec/swfdec_audio_flv.c
@@ -125,7 +125,7 @@ swfdec_audio_flv_render (SwfdecAudio *audio, gint16* dest,
   start += flv->playback_skip;
   SWFDEC_LOG ("flv %p rendering offset %u, samples %u", flv, start, n_samples);
   walk = g_queue_peek_head_link (flv->playback_queue);
-  while (n_samples) {
+  for (rendered = 0; rendered < n_samples;) {
     if (walk) {
       buffer = walk->data;
       walk = walk->next;
@@ -147,11 +147,10 @@ swfdec_audio_flv_render (SwfdecAudio *audio, gint16* dest,
     } else {
       SWFDEC_LOG ("rendering %u samples", samples);
     }
-    samples = MIN (samples, n_samples);
+    samples = MIN (samples, n_samples - rendered);
     swfdec_sound_buffer_render (dest, buffer, start, samples);
     start = 0;
     rendered += samples;
-    n_samples -= samples;
     dest += 2 * samples;
   }
   return rendered;