projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix confusion about subtitle codec pointers.
[dcpomatic.git]
/
src
/
lib
/
ffmpeg_decoder.h
diff --git
a/src/lib/ffmpeg_decoder.h
b/src/lib/ffmpeg_decoder.h
index 335364d2e18bdacfce192b3a0366ec546f408c3d..2859e23450380f7f9435a31f676cf5aa2ca1c58f 100644
(file)
--- 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>);
{
public:
FFmpegDecoder (boost::shared_ptr<const FFmpegContent>, boost::shared_ptr<Log>);
- ~FFmpegDecoder ();
private:
friend class ::ffmpeg_pts_offset_test;
private:
friend class ::ffmpeg_pts_offset_test;
@@
-75,8
+74,6
@@
private:
bool has_subtitle_during (ContentTimePeriod) const;
boost::shared_ptr<Log> _log;
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;
std::list<boost::shared_ptr<FilterGraph> > _filter_graphs;
boost::mutex _filter_graphs_mutex;