diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-10-03 21:25:04 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-10-03 21:25:04 +0100 |
| commit | 3781be4da4601176d7bb954f9cc65621d75e7344 (patch) | |
| tree | 60c192f68263b7b8f3e401cfbc7d628061ab27bf /src/lib/decoder.h | |
| parent | 5b95caee1e25a2daa7c0e872dffdb9634bddd314 (diff) | |
| parent | 3750513dd20e5b3db14a825fb566f15fb434f85d (diff) | |
Merge.
Diffstat (limited to 'src/lib/decoder.h')
| -rw-r--r-- | src/lib/decoder.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/lib/decoder.h b/src/lib/decoder.h index 14b25c7b0..19ef25ede 100644 --- a/src/lib/decoder.h +++ b/src/lib/decoder.h @@ -29,11 +29,6 @@ #include <stdint.h> #include <boost/shared_ptr.hpp> #include <sigc++/sigc++.h> -#ifdef HAVE_SWRESAMPLE -extern "C" { -#include <libswresample/swresample.h> -} -#endif #include "util.h" class Job; @@ -134,10 +129,6 @@ private: AVFilterContext* _buffer_src_context; AVFilterContext* _buffer_sink_context; -#if HAVE_SWRESAMPLE - SwrContext* _swr_context; -#endif - bool _have_setup_video_filters; DelayLine* _delay_line; int _delay_in_bytes; |