summaryrefslogtreecommitdiff
path: root/src/lib/ffmpeg_content.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-05-20 17:18:35 +0100
committerCarl Hetherington <cth@carlh.net>2013-05-20 17:18:35 +0100
commit2de990b0155fcb5c3dac821ef8c2659e903d2f6e (patch)
tree11cb6b7cc0f30c58dfd1e62f8a76f906d6b216b4 /src/lib/ffmpeg_content.h
parent0c66eaeac227d6aeb63a7a36e202ef87081dc222 (diff)
Various incomplete hacks on regions / audio mapping.
Diffstat (limited to 'src/lib/ffmpeg_content.h')
-rw-r--r--src/lib/ffmpeg_content.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/lib/ffmpeg_content.h b/src/lib/ffmpeg_content.h
index d26c73125..6c141b6c1 100644
--- a/src/lib/ffmpeg_content.h
+++ b/src/lib/ffmpeg_content.h
@@ -34,7 +34,6 @@ public:
, id (i)
, frame_rate (f)
, channels (c)
- , mapping (c)
{}
FFmpegAudioStream (boost::shared_ptr<const cxml::Node>);
@@ -45,7 +44,6 @@ public:
int id;
int frame_rate;
int channels;
- AudioMapping mapping;
};
extern bool operator== (FFmpegAudioStream const & a, FFmpegAudioStream const & b);
@@ -100,7 +98,6 @@ public:
ContentAudioFrame audio_length () const;
int content_audio_frame_rate () const;
int output_audio_frame_rate (boost::shared_ptr<const Film>) const;
- AudioMapping audio_mapping () const;
std::vector<FFmpegSubtitleStream> subtitle_streams () const {
boost::mutex::scoped_lock lm (_mutex);