diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-09-26 23:33:28 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-09-26 23:33:28 +0100 |
| commit | 9d4678143d1fa992059c90a2b0997fa5cae81e93 (patch) | |
| tree | fadf52a829da6f962b09f234ca1166e85014ecd5 /src/lib/ffmpeg.h | |
| parent | 924dd6e5356f401c325a42ccb43607b79027bb59 (diff) | |
Fix problems with subtitles when there is a non-zero PTS offset
in FFmpegDecoder. This offset was not being taken into account for
subtitles prior to this commit.
Diffstat (limited to 'src/lib/ffmpeg.h')
| -rw-r--r-- | src/lib/ffmpeg.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/lib/ffmpeg.h b/src/lib/ffmpeg.h index 961f5cbb1..b3bc13e5c 100644 --- a/src/lib/ffmpeg.h +++ b/src/lib/ffmpeg.h @@ -33,6 +33,7 @@ struct AVFrame; struct AVIOContext; class FFmpegContent; +class FFmpegAudioStream; class Log; class FFmpeg @@ -51,6 +52,10 @@ public: protected: AVCodecContext* video_codec_context () const; AVCodecContext* subtitle_codec_context () const; + ContentTime pts_offset ( + std::vector<boost::shared_ptr<FFmpegAudioStream> > audio_streams, boost::optional<ContentTime> first_video, double video_frame_rate + ) const; + static FFmpegSubtitlePeriod subtitle_period (AVSubtitle const &); boost::shared_ptr<const FFmpegContent> _ffmpeg_content; |
