Revert "Split timed from untimed sinks / sources. Should produce same output, in theory."

This reverts commit 18614dda0d53b713ace5ad1df57298d049dba87f.

1 files changed, 3 insertions, 5 deletions

diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index 32c8e224a..ac25844e3 100644
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -640,8 +640,7 @@ FFmpegDecoder::out_with_sync ()
 	if (delta > one_frame) {
 		int const extra = rint (delta / one_frame);
 		for (int i = 0; i < extra; ++i) {
-			/* XXX: timestamp is wrong */
-			repeat_last_video (source_pts_seconds);
+			repeat_last_video ();
 			_film->log()->log (
 				String::compose (
 					N_("Extra video frame inserted at %1s; source frame %2, source PTS %3 (at %4 fps)"),
@@ -740,8 +739,7 @@ FFmpegDecoder::decode_audio_packet ()
 					if (s) {
 						shared_ptr<AudioBuffers> audio (new AudioBuffers (ffa->channels(), s));
 						audio->make_silent ();
-						/* XXX: this time stamp is wrong */
-						Audio (audio, source_pts_seconds);
+						Audio (audio);
 					}
 				}
 				
@@ -750,7 +748,7 @@ FFmpegDecoder::decode_audio_packet ()
 					);
 				
 				assert (_audio_codec_context->channels == _film->audio_channels());
-				Audio (deinterleave_audio (_frame->data, data_size), source_pts_seconds );
+				Audio (deinterleave_audio (_frame->data, data_size));
 			}
 		}