summaryrefslogtreecommitdiff
path: root/src/lib/imagemagick_decoder.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-04-02 00:03:45 +0100
committerCarl Hetherington <cth@carlh.net>2013-04-02 00:03:45 +0100
commitfff7a8232b18ce6191e60ba911c29b64b9063d4d (patch)
tree3c61d950f341717c7b2478c110c9f1f6c3bef05a /src/lib/imagemagick_decoder.h
parent6809fdcbf8c65afe3c986b0e2b430d55ce7b124c (diff)
Various bits.
Diffstat (limited to 'src/lib/imagemagick_decoder.h')
-rw-r--r--src/lib/imagemagick_decoder.h11
1 files changed, 2 insertions, 9 deletions
diff --git a/src/lib/imagemagick_decoder.h b/src/lib/imagemagick_decoder.h
index 7ad08df03..424cefe08 100644
--- a/src/lib/imagemagick_decoder.h
+++ b/src/lib/imagemagick_decoder.h
@@ -31,16 +31,11 @@ public:
ImageMagickDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<const ImageMagickContent>);
float frames_per_second () const {
- /* We don't know */
- return 0;
+ return 24;
}
libdcp::Size native_size () const;
-
- ContentVideoFrame video_length () const {
- /* We don't know */
- return 0;
- }
+ ContentVideoFrame video_length () const;
int audio_channels () const {
return 0;
@@ -80,8 +75,6 @@ protected:
}
private:
- void film_changed (Film::Property);
-
boost::shared_ptr<const ImageMagickContent> _imagemagick_content;
ContentVideoFrame _position;
};