diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-12-16 12:18:08 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-12-16 12:18:08 +0000 |
| commit | 9c58fcdb6fd8131c17456dd71c5c277a6b0ae053 (patch) | |
| tree | b18c58859a4b2365be252253e47c578bb1c33bf7 /src/lib/decoder_factory.h | |
| parent | 6375f7268d0acd53c6dc7968e17a15471fba3a45 (diff) | |
Integrated FFmpeg player (slow).
Diffstat (limited to 'src/lib/decoder_factory.h')
| -rw-r--r-- | src/lib/decoder_factory.h | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/src/lib/decoder_factory.h b/src/lib/decoder_factory.h index 1f3690611..88f719ba2 100644 --- a/src/lib/decoder_factory.h +++ b/src/lib/decoder_factory.h @@ -17,6 +17,9 @@ */ +#ifndef DVDOMATIC_DECODER_FACTORY_H +#define DVDOMATIC_DECODER_FACTORY_H + /** @file src/decoder_factory.h * @brief A method to create appropriate decoders for some content. */ @@ -27,6 +30,20 @@ class Job; class VideoDecoder; class AudioDecoder; -extern std::pair<boost::shared_ptr<VideoDecoder>, boost::shared_ptr<AudioDecoder> > decoder_factory ( +struct Decoders { + Decoders () {} + + Decoders (boost::shared_ptr<VideoDecoder> v, boost::shared_ptr<AudioDecoder> a) + : video (v) + , audio (a) + {} + + boost::shared_ptr<VideoDecoder> video; + boost::shared_ptr<AudioDecoder> audio; +}; + +extern Decoders decoder_factory ( boost::shared_ptr<Film>, boost::shared_ptr<const Options>, Job * ); + +#endif |
