projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix deadlock.
[dcpomatic.git]
/
src
/
lib
/
content_subtitle.h
diff --git
a/src/lib/content_subtitle.h
b/src/lib/content_subtitle.h
index 8868618ada940ccf883f552dbf075ab449fab3bb..36bc22b13e5e5f04d7bd9243f264784eb67ac7cb 100644
(file)
--- a/
src/lib/content_subtitle.h
+++ b/
src/lib/content_subtitle.h
@@
-20,11
+20,11
@@
#ifndef DCPOMATIC_CONTENT_SUBTITLE_H
#define DCPOMATIC_CONTENT_SUBTITLE_H
#ifndef DCPOMATIC_CONTENT_SUBTITLE_H
#define DCPOMATIC_CONTENT_SUBTITLE_H
-#include <list>
-#include <dcp/subtitle_string.h>
#include "dcpomatic_time.h"
#include "rect.h"
#include "image_subtitle.h"
#include "dcpomatic_time.h"
#include "rect.h"
#include "image_subtitle.h"
+#include <dcp/subtitle_string.h>
+#include <list>
class Image;
class Image;