summaryrefslogtreecommitdiff
path: root/src/lib/ffmpeg_content.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-07-16 23:09:34 +0100
committerCarl Hetherington <cth@carlh.net>2013-07-16 23:09:34 +0100
commit5778f4c92793a7950f02206e735a00731c87b090 (patch)
tree4d532804245e4da0b24cc0245d940edc260aa4db /src/lib/ffmpeg_content.cc
parentbfc0b96db6cc6c2e94d93f9c4239adca14a6bb0c (diff)
Fix up AudioMapping confusions with respect to number of content channels.
Diffstat (limited to 'src/lib/ffmpeg_content.cc')
-rw-r--r--src/lib/ffmpeg_content.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc
index 4c9b1d166..ebad8c8bd 100644
--- a/src/lib/ffmpeg_content.cc
+++ b/src/lib/ffmpeg_content.cc
@@ -281,12 +281,12 @@ operator== (FFmpegAudioStream const & a, FFmpegAudioStream const & b)
}
FFmpegAudioStream::FFmpegAudioStream (shared_ptr<const cxml::Node> node)
+ : mapping (node->node_child ("Mapping"))
{
name = node->string_child ("Name");
id = node->number_child<int> ("Id");
frame_rate = node->number_child<int> ("FrameRate");
channels = node->number_child<int64_t> ("Channels");
- mapping = AudioMapping (node->node_child ("Mapping"));
first_audio = node->optional_number_child<double> ("FirstAudio");
}