summaryrefslogtreecommitdiff
path: root/src/lib/ffmpeg_decoder.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2012-11-14 20:04:15 +0000
committerCarl Hetherington <cth@carlh.net>2012-11-14 20:04:15 +0000
commit05c37b9bb09f7bfa4c2ec8ea6b3fa4a83d0fec20 (patch)
treefa7a3e408c2eb66b070864694b6af7e0787e508f /src/lib/ffmpeg_decoder.h
parent5161626c3c28ba528511a8b211286a5e81a0f02a (diff)
Tests pass again.
Diffstat (limited to 'src/lib/ffmpeg_decoder.h')
-rw-r--r--src/lib/ffmpeg_decoder.h12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index 856ac0801..5c6f8ab26 100644
--- a/src/lib/ffmpeg_decoder.h
+++ b/src/lib/ffmpeg_decoder.h
@@ -58,6 +58,10 @@ public:
/* Methods to query our input video */
float frames_per_second () const;
Size native_size () const;
+ int time_base_numerator () const;
+ int time_base_denominator () const;
+ int sample_aspect_ratio_numerator () const;
+ int sample_aspect_ratio_denominator () const;
void set_audio_stream (boost::optional<AudioStream>);
void set_subtitle_stream (boost::optional<SubtitleStream>);
@@ -66,13 +70,11 @@ private:
bool pass ();
PixelFormat pixel_format () const;
- int time_base_numerator () const;
- int time_base_denominator () const;
- int sample_aspect_ratio_numerator () const;
- int sample_aspect_ratio_denominator () const;
AVSampleFormat audio_sample_format () const;
int bytes_per_audio_sample () const;
+ void filter_and_emit_video (AVFrame *);
+
void setup_general ();
void setup_video ();
void setup_audio ();
@@ -99,4 +101,6 @@ private:
boost::optional<double> _first_video;
boost::optional<double> _first_audio;
+
+ std::list<boost::shared_ptr<FilterGraph> > _filter_graphs;
};