diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-10-20 19:30:04 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-10-20 19:30:04 +0100 |
| commit | 58f53485bb112896a9446771acfa2abe0a528cec (patch) | |
| tree | f34f14aa40f8ce0854f104fbabccd4f756bafd3d /src/lib/ffmpeg_decoder.h | |
| parent | 6e8e4f7ae9a9ae243a1b7d9e17f6b6cacae277b3 (diff) | |
Try to clean up stream handling wrt audio channel counts.
Diffstat (limited to 'src/lib/ffmpeg_decoder.h')
| -rw-r--r-- | src/lib/ffmpeg_decoder.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h index 0d256b37e..339afbaef 100644 --- a/src/lib/ffmpeg_decoder.h +++ b/src/lib/ffmpeg_decoder.h @@ -67,11 +67,8 @@ public: bool has_subtitles () const; int bytes_per_audio_sample () const; - std::vector<Stream> audio_streams () const; - std::vector<Stream> subtitle_streams () const; - - void set_audio_stream (int id); - void set_subtitle_stream (int id); + std::vector<AudioStream> audio_streams () const; + std::vector<SubtitleStream> subtitle_streams () const; private: @@ -97,8 +94,8 @@ private: int _subtitle_stream; ///< may be < 0 if there is no subtitle AVFrame* _frame; - std::vector<Stream> _audio_streams; - std::vector<Stream> _subtitle_streams; + std::vector<AudioStream> _audio_streams; + std::vector<SubtitleStream> _subtitle_streams; AVCodecContext* _video_codec_context; AVCodec* _video_codec; |