From b9f6e9512017dc1ecd3a42aa1ef3c6058608cef5 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Tue, 21 May 2013 23:19:31 +0100
Subject: Give Film a container; move crop into video content; other bits.

---
 src/lib/ffmpeg_decoder.cc | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/lib/ffmpeg_decoder.cc')

diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index a637160ae..fcb2e82ba 100644
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -68,7 +68,7 @@ boost::mutex FFmpegDecoder::_mutex;
 
 FFmpegDecoder::FFmpegDecoder (shared_ptr<const Film> f, shared_ptr<const FFmpegContent> c, bool video, bool audio, bool subtitles)
 	: Decoder (f)
-	, VideoDecoder (f)
+	, VideoDecoder (f, c)
 	, AudioDecoder (f, c)
 	, _ffmpeg_content (c)
 	, _format_context (0)
@@ -540,7 +540,6 @@ void
 FFmpegDecoder::film_changed (Film::Property p)
 {
 	switch (p) {
-	case Film::CROP:
 	case Film::FILTERS:
 	{
 		boost::mutex::scoped_lock lm (_filter_graphs_mutex);
-- 
cgit v1.2.3