diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-06-01 12:28:00 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-06-01 12:28:00 +0100 |
| commit | 9dd35cac8c6ca8198eb858891dfb0a0d9cdede4c (patch) | |
| tree | 99fb4bc83158d384eb91e3c7c29b97239e81a3cc /src/lib | |
| parent | 4cbf56d2cfd8a78a7274fd69b4aaf1394bb4e801 (diff) | |
Basics of better audio stream labelling in the audio mapping view (#849).
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/ffmpeg_examiner.cc | 18 | ||||
| -rw-r--r-- | src/lib/ffmpeg_examiner.h | 1 |
2 files changed, 1 insertions, 18 deletions
diff --git a/src/lib/ffmpeg_examiner.cc b/src/lib/ffmpeg_examiner.cc index f98c478e7..06154cc8c 100644 --- a/src/lib/ffmpeg_examiner.cc +++ b/src/lib/ffmpeg_examiner.cc @@ -67,7 +67,7 @@ FFmpegExaminer::FFmpegExaminer (shared_ptr<const FFmpegContent> c, shared_ptr<Jo _audio_streams.push_back ( shared_ptr<FFmpegAudioStream> ( new FFmpegAudioStream ( - audio_stream_name (s), + stream_name (s), s->id, s->codec->sample_rate, (double (_format_context->duration) / AV_TIME_BASE) * s->codec->sample_rate, @@ -346,22 +346,6 @@ FFmpegExaminer::sample_aspect_ratio () const } string -FFmpegExaminer::audio_stream_name (AVStream* s) const -{ - SafeStringStream n; - - n << stream_name (s); - - if (!n.str().empty()) { - n << "; "; - } - - n << s->codec->channels << " channels"; - - return n.str (); -} - -string FFmpegExaminer::subtitle_stream_name (AVStream* s) const { SafeStringStream n; diff --git a/src/lib/ffmpeg_examiner.h b/src/lib/ffmpeg_examiner.h index f338723b7..c3dde84fe 100644 --- a/src/lib/ffmpeg_examiner.h +++ b/src/lib/ffmpeg_examiner.h @@ -77,7 +77,6 @@ private: void subtitle_packet (AVCodecContext *, boost::shared_ptr<FFmpegSubtitleStream>); std::string stream_name (AVStream* s) const; - std::string audio_stream_name (AVStream* s) const; std::string subtitle_stream_name (AVStream* s) const; boost::optional<ContentTime> frame_time (AVStream* s) const; |