summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-04-10 20:17:52 +0100
committerCarl Hetherington <cth@carlh.net>2013-04-10 20:17:52 +0100
commit8f1c131a933e7695684e22eb82abba30fe119915 (patch)
treef3265f5d33b4104c1506f629ad8827788e936a45 /src
parentbb1251a3b0abe2343962e126b690d97ebf8394c5 (diff)
Fix typo.
Diffstat (limited to 'src')
-rw-r--r--src/lib/ffmpeg_content.cc1
-rw-r--r--src/lib/playlist.cc2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc
index d36abe2c3..0424fbc33 100644
--- a/src/lib/ffmpeg_content.cc
+++ b/src/lib/ffmpeg_content.cc
@@ -31,6 +31,7 @@ using std::string;
using std::stringstream;
using std::vector;
using std::list;
+using std::cout;
using boost::shared_ptr;
using boost::lexical_cast;
diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc
index d26dae730..717c1dace 100644
--- a/src/lib/playlist.cc
+++ b/src/lib/playlist.cc
@@ -132,7 +132,7 @@ Playlist::audio_frame_rate () const
{
shared_ptr<const FFmpegContent> fc = first_ffmpeg ();
if (fc) {
- return fc->audio_channels ();
+ return fc->audio_frame_rate ();
}
break;
}