- if (boost::filesystem::is_directory (f->content_path ())) {
- /* Assume a directory contains TIFFs */
- return shared_ptr<Decoder> (new TIFFDecoder (f, o, j, minimal));
+ if (boost::filesystem::is_directory (f->content_path()) || f->content_type() == STILL) {
+ /* A single image file, or a directory of them */
+ return make_pair (
+ shared_ptr<VideoDecoder> (new ImageMagickDecoder (f, o, j)),
+ shared_ptr<AudioDecoder> ()
+ );