projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.
[dcpomatic.git]
/
src
/
lib
/
subtitle_content.h
diff --git
a/src/lib/subtitle_content.h
b/src/lib/subtitle_content.h
index 57f5eb9509264d68957ac8f99ef282932cbb28f9..97649f4d525590a2ad1fdb333a6b789bad9087e1 100644
(file)
--- a/
src/lib/subtitle_content.h
+++ b/
src/lib/subtitle_content.h
@@
-76,7
+76,7
@@
public:
}
private:
- friend
class
ffmpeg_pts_offset_test;
+ friend
struct
ffmpeg_pts_offset_test;
bool _use_subtitles;
/** x offset for placing subtitles, as a proportion of the container width;