diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-12-20 00:27:18 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-12-20 00:27:18 +0000 |
| commit | 58bf77268a8e82e73d7f17ab2fe6dcd29370ade3 (patch) | |
| tree | 0ad0542a74a029920afac6f2eb74f05770d9d4b0 /src/lib/decoder_factory.cc | |
| parent | 7829cea9160cd562ed3da5ca1a0060de29edacf8 (diff) | |
| parent | 7faadda40c0ab027b992789329a558fbaf3ec0cc (diff) | |
Merge branch 'video-player' of /home/carl/git/dvdomatic into video-player
Diffstat (limited to 'src/lib/decoder_factory.cc')
| -rw-r--r-- | src/lib/decoder_factory.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/decoder_factory.cc b/src/lib/decoder_factory.cc index 1d8d12cd5..2a0d828e2 100644 --- a/src/lib/decoder_factory.cc +++ b/src/lib/decoder_factory.cc @@ -43,7 +43,7 @@ decoder_factory ( /* A single image file, or a directory of them */ return Decoders ( shared_ptr<VideoDecoder> (new ImageMagickDecoder (f, o, j)), - shared_ptr<AudioDecoder> () + shared_ptr<AudioDecoder> (new ExternalAudioDecoder (f, o, j)) ); } |
