summaryrefslogtreecommitdiff
path: root/src/lib/ffmpeg_decoder.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-06-27 11:16:37 +0100
committerCarl Hetherington <cth@carlh.net>2014-06-27 11:16:37 +0100
commit2f99a801dfb1668d7efda4eb8a3f5638d2fe20d2 (patch)
tree69117c856701cdfe96206f8cee12b2dd34f070fa /src/lib/ffmpeg_decoder.h
parent76ce03b70441e2552f2ad62dc116e75b2f6dcf3c (diff)
Fix confusion about subtitle codec pointers.
Diffstat (limited to 'src/lib/ffmpeg_decoder.h')
-rw-r--r--src/lib/ffmpeg_decoder.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index 335364d2e..2859e2345 100644
--- a/src/lib/ffmpeg_decoder.h
+++ b/src/lib/ffmpeg_decoder.h
@@ -48,7 +48,6 @@ class FFmpegDecoder : public VideoDecoder, public AudioDecoder, public SubtitleD
{
public:
FFmpegDecoder (boost::shared_ptr<const FFmpegContent>, boost::shared_ptr<Log>);
- ~FFmpegDecoder ();
private:
friend class ::ffmpeg_pts_offset_test;
@@ -75,8 +74,6 @@ private:
bool has_subtitle_during (ContentTimePeriod) const;
boost::shared_ptr<Log> _log;
- AVCodecContext* _subtitle_codec_context; ///< may be 0 if there is no subtitle
- AVCodec* _subtitle_codec; ///< may be 0 if there is no subtitle
std::list<boost::shared_ptr<FilterGraph> > _filter_graphs;
boost::mutex _filter_graphs_mutex;