diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-11-15 22:26:16 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-11-15 22:26:16 +0000 |
| commit | 4fbd1901fdabc829cfa7e7d4d0c1272bba87033c (patch) | |
| tree | 416701b4a2923cdc16983311239bd311282e8438 /src/lib/ffmpeg_decoder.cc | |
| parent | f5c40275a2dc444c295a547dfedcd8f9eee2bcb2 (diff) | |
Untested external audio support; AB transcodes still broken.
Diffstat (limited to 'src/lib/ffmpeg_decoder.cc')
| -rw-r--r-- | src/lib/ffmpeg_decoder.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc index 3767d7c5f..60f192c85 100644 --- a/src/lib/ffmpeg_decoder.cc +++ b/src/lib/ffmpeg_decoder.cc @@ -60,6 +60,8 @@ using boost::optional; FFmpegDecoder::FFmpegDecoder (shared_ptr<Film> f, shared_ptr<const Options> o, Job* j) : Decoder (f, o, j) + , VideoDecoder (f, o, j) + , AudioDecoder (f, o, j) , _format_context (0) , _video_stream (-1) , _frame (0) @@ -519,14 +521,14 @@ FFmpegDecoder::bytes_per_audio_sample () const void FFmpegDecoder::set_audio_stream (optional<AudioStream> s) { - Decoder::set_audio_stream (s); + AudioDecoder::set_audio_stream (s); setup_audio (); } void FFmpegDecoder::set_subtitle_stream (optional<SubtitleStream> s) { - Decoder::set_subtitle_stream (s); + VideoDecoder::set_subtitle_stream (s); setup_subtitle (); } |