diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-04-10 20:45:07 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-04-10 20:45:07 +0100 |
| commit | 4dee3db5222be7972930dbc621e9ab15a81d33d2 (patch) | |
| tree | 5d19e620d6d074bf174e4e05fe3028b8eef7047d /src/lib/ffmpeg_content.cc | |
| parent | 8f1c131a933e7695684e22eb82abba30fe119915 (diff) | |
Remove believed unnecessary audio channel layout stuff for resampler.
Diffstat (limited to 'src/lib/ffmpeg_content.cc')
| -rw-r--r-- | src/lib/ffmpeg_content.cc | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc index 0424fbc33..577dbd14d 100644 --- a/src/lib/ffmpeg_content.cc +++ b/src/lib/ffmpeg_content.cc @@ -216,7 +216,7 @@ FFmpegContent::audio_channels () const return 0; } - return _audio_stream->channels (); + return _audio_stream->channels; } int @@ -229,16 +229,6 @@ FFmpegContent::audio_frame_rate () const return _audio_stream->frame_rate; } -int64_t -FFmpegContent::audio_channel_layout () const -{ - if (!_audio_stream) { - return 0; - } - - return _audio_stream->channel_layout; -} - bool operator== (FFmpegSubtitleStream const & a, FFmpegSubtitleStream const & b) { @@ -256,7 +246,7 @@ FFmpegAudioStream::FFmpegAudioStream (shared_ptr<const cxml::Node> node) name = node->string_child ("Name"); id = node->number_child<int> ("Id"); frame_rate = node->number_child<int> ("FrameRate"); - channel_layout = node->number_child<int64_t> ("ChannelLayout"); + channels = node->number_child<int64_t> ("Channels"); } void @@ -265,7 +255,7 @@ FFmpegAudioStream::as_xml (xmlpp::Node* root) const root->add_child("Name")->add_child_text (name); root->add_child("Id")->add_child_text (lexical_cast<string> (id)); root->add_child("FrameRate")->add_child_text (lexical_cast<string> (frame_rate)); - root->add_child("ChannelLayout")->add_child_text (lexical_cast<string> (channel_layout)); + root->add_child("Channels")->add_child_text (lexical_cast<string> (channels)); } /** Construct a SubtitleStream from a value returned from to_string(). |