diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-09-28 23:09:15 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-09-28 23:09:15 +0100 |
| commit | c0ed407fb02891f0dd364e78b6192f0e6dbe1d8d (patch) | |
| tree | cfa1abb09f891f220f15886b4cad2d1562f4a79c /src/lib/decoder.h | |
| parent | d50fe6707c973d4a1397aa40b67ae753744ce748 (diff) | |
| parent | c252cb33a3ca8088fbe091af903a77ad8a098969 (diff) | |
Merge branch 'master' of /home/carl/git/dvdomatic
Diffstat (limited to 'src/lib/decoder.h')
| -rw-r--r-- | src/lib/decoder.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/lib/decoder.h b/src/lib/decoder.h index 5c69e12d0..14b25c7b0 100644 --- a/src/lib/decoder.h +++ b/src/lib/decoder.h @@ -29,9 +29,11 @@ #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; @@ -132,7 +134,9 @@ private: AVFilterContext* _buffer_src_context; AVFilterContext* _buffer_sink_context; +#if HAVE_SWRESAMPLE SwrContext* _swr_context; +#endif bool _have_setup_video_filters; DelayLine* _delay_line; @@ -141,7 +145,7 @@ private: /* Number of audio frames that we have pushed to the encoder (at the DCP sample rate). */ - int _audio_frames_processed; + int64_t _audio_frames_processed; }; #endif |