diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-05-03 10:01:36 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-05-03 10:01:36 +0100 |
| commit | 3fc3aad8735903ced3dae65f764eb33e3f5b3f11 (patch) | |
| tree | be6e5dd91a8c8b07e50a93f835ccff2706907441 /src/lib/ffmpeg_decoder.cc | |
| parent | fdd63a4c9925f0339089dce3a52f0d6ed0d97880 (diff) | |
Try to fix the filter / AVFrame ownership.
Diffstat (limited to 'src/lib/ffmpeg_decoder.cc')
| -rw-r--r-- | src/lib/ffmpeg_decoder.cc | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc index cd68e5294..982139515 100644 --- a/src/lib/ffmpeg_decoder.cc +++ b/src/lib/ffmpeg_decoder.cc @@ -506,12 +506,6 @@ FFmpegDecoder::filter_and_emit_video () return; } - if (_film->crop() == Crop() && _film->filters().empty()) { - /* No filter graph needed; just emit */ - emit_video (shared_ptr<Image> (new FrameImage (_frame, false)), false, bet * av_q2d (_format_context->streams[_video_stream]->time_base)); - return; - } - shared_ptr<FilterGraph> graph; { @@ -523,7 +517,7 @@ FFmpegDecoder::filter_and_emit_video () } if (i == _filter_graphs.end ()) { - graph.reset (new FilterGraph (_film, this, libdcp::Size (_frame->width, _frame->height), (AVPixelFormat) _frame->format)); + graph = filter_graph_factory (_film, this, libdcp::Size (_frame->width, _frame->height), (AVPixelFormat) _frame->format); _filter_graphs.push_back (graph); _film->log()->log (String::compose (N_("New graph for %1x%2, pixel format %3"), _frame->width, _frame->height, _frame->format)); } else { |