From 913b1ae68f8e953ff2323b6b7f86cd515c2592d0 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 25 Oct 2012 00:06:47 +0100 Subject: Erroneous leftover _log in Decoder; use decoder audio channels count rather than Film's. --- src/lib/ffmpeg_decoder.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/lib/ffmpeg_decoder.cc') diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc index b6cdce0e4..034fefeb2 100644 --- a/src/lib/ffmpeg_decoder.cc +++ b/src/lib/ffmpeg_decoder.cc @@ -275,7 +275,7 @@ FFmpegDecoder::do_pass () /* frames of silence that we must push */ int const s = rint ((_first_audio.get() - _first_video.get()) * audio_sample_rate ()); - _log->log ( + _film->log()->log ( String::compose ( "First video at %1, first audio at %2, pushing %3 frames of silence for %4 channels (%5 bytes per sample)", _first_video.get(), _first_audio.get(), s, audio_channels(), bytes_per_audio_sample() -- cgit v1.2.3