Merge branch 'fix-early-audio-take2' into staging

1 files changed, 10 insertions, 4 deletions

diff --git a/src/lib/imagemagick_decoder.cc b/src/lib/imagemagick_decoder.cc
index 5dc0b7b06..5ce22c296 100644
--- a/src/lib/imagemagick_decoder.cc
+++ b/src/lib/imagemagick_decoder.cc
@@ -77,7 +77,7 @@ ImageMagickDecoder::pass ()
 			return true;
 		}
 
-		repeat_last_video ();
+		emit_video (_image, true, double (video_frame()) / frames_per_second());
 		return false;
 	}
 	
@@ -100,9 +100,9 @@ ImageMagickDecoder::pass ()
 
 	delete magick_image;
 
-	image = image->crop (_film->crop(), true);
-	
-	emit_video (image, 0);
+	_image = image->crop (_film->crop(), true);
+
+	emit_video (_image, false, double (video_frame()) / frames_per_second());
 
 	++_iter;
 	return false;
@@ -150,3 +150,9 @@ ImageMagickDecoder::film_changed (Film::Property p)
 		OutputChanged ();
 	}
 }
+
+float
+ImageMagickDecoder::frames_per_second () const
+{
+	return _film->source_frame_rate ();
+}