projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix typo preventing audio sync fixes when audio follows video.
[dcpomatic.git]
/
src
/
lib
/
video_decoder.h
diff --git
a/src/lib/video_decoder.h
b/src/lib/video_decoder.h
index 7d43c9e82539aa0caf39b7dac2c6338921032517..6e4fd48c0019710a2632e921d35645efa119c239 100644
(file)
--- a/
src/lib/video_decoder.h
+++ b/
src/lib/video_decoder.h
@@
-65,7
+65,7
@@
protected:
virtual PixelFormat pixel_format () const = 0;
virtual PixelFormat pixel_format () const = 0;
- void emit_video (boost::shared_ptr<Image>, double);
+ void emit_video (boost::shared_ptr<Image>,
bool,
double);
void emit_subtitle (boost::shared_ptr<TimedSubtitle>);
/** Subtitle stream to use when decoding */
void emit_subtitle (boost::shared_ptr<TimedSubtitle>);
/** Subtitle stream to use when decoding */
@@
-74,8
+74,6
@@
protected:
std::vector<boost::shared_ptr<SubtitleStream> > _subtitle_streams;
private:
std::vector<boost::shared_ptr<SubtitleStream> > _subtitle_streams;
private:
- void signal_video (boost::shared_ptr<Image>, bool, boost::shared_ptr<Subtitle>, double);
-
int _video_frame;
double _last_source_time;
int _video_frame;
double _last_source_time;