diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-05-21 23:19:31 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-05-21 23:19:31 +0100 |
| commit | b9f6e9512017dc1ecd3a42aa1ef3c6058608cef5 (patch) | |
| tree | 0c5ccae6f26d46c270e9287a722b63e397900c57 /src/lib/ffmpeg_decoder.cc | |
| parent | 02e4022f540915f8a38f9ab9576ac896fe39a1ab (diff) | |
Give Film a container; move crop into video content; other bits.
Diffstat (limited to 'src/lib/ffmpeg_decoder.cc')
| -rw-r--r-- | src/lib/ffmpeg_decoder.cc | 3 |
1 files changed, 1 insertions, 2 deletions
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); |