diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-10-24 00:49:37 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-10-24 00:49:37 +0100 |
| commit | 2783bac450101e809c485ef249ce55a9c6d7996e (patch) | |
| tree | ba71ef28d167d061b2ecde34dd6f2f2e01c06993 /src/lib | |
| parent | 579dfce1bae018efd73c9f5f3f31770cb401d19a (diff) | |
Remove old unused stuff.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/decoder.h | 2 | ||||
| -rw-r--r-- | src/lib/ffmpeg_decoder.cc | 6 | ||||
| -rw-r--r-- | src/lib/ffmpeg_decoder.h | 2 | ||||
| -rw-r--r-- | src/lib/imagemagick_decoder.h | 4 | ||||
| -rw-r--r-- | src/lib/tiff_decoder.cc | 6 | ||||
| -rw-r--r-- | src/lib/tiff_decoder.h | 1 |
6 files changed, 0 insertions, 21 deletions
diff --git a/src/lib/decoder.h b/src/lib/decoder.h index e81fbb24e..f530de0eb 100644 --- a/src/lib/decoder.h +++ b/src/lib/decoder.h @@ -56,8 +56,6 @@ public: /* Methods to query our input video */ - /** @return length in video frames */ - virtual int length_in_frames () const = 0; /** @return video frames per second, or 0 if unknown */ virtual float frames_per_second () const = 0; /** @return native size in pixels */ diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc index 5eb32a014..e2aa8add0 100644 --- a/src/lib/ffmpeg_decoder.cc +++ b/src/lib/ffmpeg_decoder.cc @@ -323,12 +323,6 @@ FFmpegDecoder::do_pass () return false; } -int -FFmpegDecoder::length_in_frames () const -{ - return (_format_context->duration / AV_TIME_BASE) * frames_per_second (); -} - float FFmpegDecoder::frames_per_second () const { diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h index 29e06c7d4..26b5d6979 100644 --- a/src/lib/ffmpeg_decoder.h +++ b/src/lib/ffmpeg_decoder.h @@ -57,8 +57,6 @@ public: ~FFmpegDecoder (); /* Methods to query our input video */ - int length_in_frames () const; - int decoding_frames () const; float frames_per_second () const; Size native_size () const; int audio_channels () const; diff --git a/src/lib/imagemagick_decoder.h b/src/lib/imagemagick_decoder.h index 809f3aecd..3e58e645f 100644 --- a/src/lib/imagemagick_decoder.h +++ b/src/lib/imagemagick_decoder.h @@ -28,10 +28,6 @@ class ImageMagickDecoder : public Decoder public: ImageMagickDecoder (boost::shared_ptr<const FilmState>, boost::shared_ptr<const Options>, Job *, Log *, bool, bool); - int length_in_frames () const { - return 1; - } - float frames_per_second () const { return static_frames_per_second (); } diff --git a/src/lib/tiff_decoder.cc b/src/lib/tiff_decoder.cc index 27dd0d69c..51c0b60d1 100644 --- a/src/lib/tiff_decoder.cc +++ b/src/lib/tiff_decoder.cc @@ -78,12 +78,6 @@ TIFFDecoder::TIFFDecoder (boost::shared_ptr<const FilmState> fs, boost::shared_p } -int -TIFFDecoder::length_in_frames () const -{ - return _files.size (); -} - float TIFFDecoder::frames_per_second () const { diff --git a/src/lib/tiff_decoder.h b/src/lib/tiff_decoder.h index b9849a259..07174889d 100644 --- a/src/lib/tiff_decoder.h +++ b/src/lib/tiff_decoder.h @@ -46,7 +46,6 @@ public: TIFFDecoder (boost::shared_ptr<const FilmState>, boost::shared_ptr<const Options>, Job *, Log *, bool, bool); /* Methods to query our input video */ - int length_in_frames () const; float frames_per_second () const; Size native_size () const; int audio_channels () const; |
