summaryrefslogtreecommitdiff
path: root/src/lib/ffmpeg_decoder.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2012-12-16 13:43:25 +0000
committerCarl Hetherington <cth@carlh.net>2012-12-16 13:43:25 +0000
commit3171c89fef95b19c8889996caaac73eea71cf388 (patch)
treedeeeda477690ff9af5a67bd210270b5da7806371 /src/lib/ffmpeg_decoder.h
parent1f2bc4d8f3601ad1e12b94f37b3889fcd003509b (diff)
Decoder handles crop changing.
Diffstat (limited to 'src/lib/ffmpeg_decoder.h')
-rw-r--r--src/lib/ffmpeg_decoder.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index d483db1d9..d5753393e 100644
--- a/src/lib/ffmpeg_decoder.h
+++ b/src/lib/ffmpeg_decoder.h
@@ -26,6 +26,7 @@
#include <stdint.h>
#include <boost/shared_ptr.hpp>
#include <boost/optional.hpp>
+#include <boost/thread/mutex.hpp>
extern "C" {
#include <libavcodec/avcodec.h>
#include <libpostproc/postprocess.h>
@@ -34,6 +35,7 @@ extern "C" {
#include "decoder.h"
#include "video_decoder.h"
#include "audio_decoder.h"
+#include "film.h"
struct AVFilterGraph;
struct AVCodecContext;
@@ -117,6 +119,8 @@ private:
void maybe_add_subtitle ();
boost::shared_ptr<AudioBuffers> deinterleave_audio (uint8_t* data, int size);
+ void film_changed (Film::Property);
+
std::string stream_name (AVStream* s) const;
AVFormatContext* _format_context;
@@ -137,4 +141,5 @@ private:
boost::optional<double> _first_audio;
std::list<boost::shared_ptr<FilterGraph> > _filter_graphs;
+ boost::mutex _filter_graphs_mutex;
};