Remove log from ImageProxy hierarchy.

[dcpomatic.git] / src / lib / ffmpeg_decoder.cc

diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index d1b65cbc2846b56014f8dbc6a1bd108ab9408501..e90c33c80a848bca3c3faecbd7032c1df72d0526 100644 (file)
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -341,9 +341,6 @@ FFmpegDecoder::decode_audio_packet ()
 
                           Returning from the method here caused mantis #352.
                        */
-                       
-                       shared_ptr<const Film> film = _film.lock ();
-                       assert (film);
                        LOG_WARNING ("avcodec_decode_audio4 failed (%1)", decode_result);
 
                        /* Fudge decode_result so that we come out of the while loop when
@@ -404,7 +401,7 @@ FFmpegDecoder::decode_video_packet ()
                if (i->second != AV_NOPTS_VALUE) {
                        double const pts = i->second * av_q2d (_format_context->streams[_video_stream]->time_base) + _pts_offset.seconds ();
                        video (
-                               shared_ptr<ImageProxy> (new RawImageProxy (image, _video_content->film()->log())),
+                               shared_ptr<ImageProxy> (new RawImageProxy (image)),
                                rint (pts * _ffmpeg_content->video_frame_rate ())
                                );
                } else {