diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-10-02 16:14:29 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-10-02 16:14:29 +0100 |
| commit | c55d8bcda8f4da74bbc9489127354211cea8f2ff (patch) | |
| tree | d81b7197b635c6a9bcf9889c3dc4e6b9bc45bde3 /src/lib/decoder.h | |
| parent | 11c0aac8508ac1a54e63bdcb31a85c941a7fb546 (diff) | |
| parent | 0f154f43bd0c88d1615e455bd8a169826a08c086 (diff) | |
Merge branch 'resample-drop-frame'
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; |