diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-08-04 15:46:53 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-08-04 15:46:53 +0100 |
| commit | 29ec724e75f11e6e20997cbeaa7c2519c11cfda2 (patch) | |
| tree | f2c0bc1bcbb234454455d46d09a00b5d83785869 /src/lib/decoder.cc | |
| parent | e0e7f9f5dc1360e836db4c785f1a563dffeb2e44 (diff) | |
Update README a bit.
Diffstat (limited to 'src/lib/decoder.cc')
| -rw-r--r-- | src/lib/decoder.cc | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/lib/decoder.cc b/src/lib/decoder.cc index d1b04ed32..faee5bece 100644 --- a/src/lib/decoder.cc +++ b/src/lib/decoder.cc @@ -359,7 +359,6 @@ Decoder::process_video (AVFrame* frame) #endif -//#ifdef DVDOMATIC_FFMPEG_0_8_3 #if LIBAVFILTER_VERSION_MAJOR == 2 && LIBAVFILTER_VERSION_MINOR >= 23 && LIBAVFILTER_VERSION_MINOR <= 61 while (avfilter_poll_frame (_buffer_sink_context->inputs[0])) { #else @@ -435,7 +434,10 @@ Decoder::setup_video_filters () throw DecodeError ("Could not find buffer src filter"); } - AVFilter* buffer_sink = get_sink (); + AVFilter* buffer_sink = avfilter_get_by_name("buffersink"); + if (buffer_sink == 0) { + throw DecodeError ("Could not create buffer sink filter"); + } stringstream a; a << native_size().width << ":" @@ -469,12 +471,7 @@ Decoder::setup_video_filters () inputs->next = 0; _log->log ("Using filter chain `" + filters + "'"); -#ifdef DVDOMATIC_FFMPEG_0_8_3 - if (avfilter_graph_parse (graph, filters.c_str(), inputs, outputs, 0) < 0) { -#else if (avfilter_graph_parse (graph, filters.c_str(), &inputs, &outputs, 0) < 0) { -#endif - throw DecodeError ("could not set up filter graph."); } |