diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-07-11 17:26:16 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-07-11 17:26:16 +0100 |
| commit | 39c36075c62ce4c148ce14de0ae7b29d8427be2b (patch) | |
| tree | 81e90e8065df9c1d68a6e6be646c5825400538dd /src/lib/ffmpeg_decoder.cc | |
| parent | 6ff93316d9e89fd649b9fabac258318ed8470007 (diff) | |
| parent | 8bdc282a88cbd0446b06866b9436c43200886314 (diff) | |
Merge branch '1.0' of /home/carl/git/dvdomatic into 1.0
Diffstat (limited to 'src/lib/ffmpeg_decoder.cc')
| -rw-r--r-- | src/lib/ffmpeg_decoder.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc index fddb70294..b2eb1dbde 100644 --- a/src/lib/ffmpeg_decoder.cc +++ b/src/lib/ffmpeg_decoder.cc @@ -59,7 +59,7 @@ using libdcp::Size; FFmpegDecoder::FFmpegDecoder (shared_ptr<const Film> f, shared_ptr<const FFmpegContent> c, bool video, bool audio) : Decoder (f) , VideoDecoder (f) - , AudioDecoder (f) + , AudioDecoder (f, c) , SubtitleDecoder (f) , FFmpeg (c) , _subtitle_codec_context (0) |