projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master; fix crash on new film.
[dcpomatic.git]
/
src
/
lib
/
video_sink.h
diff --git
a/src/lib/video_sink.h
b/src/lib/video_sink.h
index 0170c7350c90d1f1898c9a275b7d21556fc4c2e5..6239bc557ab68ac43b28f356372404a21566109b 100644
(file)
--- a/
src/lib/video_sink.h
+++ b/
src/lib/video_sink.h
@@
-17,8
+17,8
@@
*/
-#ifndef D
VD
OMATIC_VIDEO_SINK_H
-#define D
VD
OMATIC_VIDEO_SINK_H
+#ifndef D
CP
OMATIC_VIDEO_SINK_H
+#define D
CP
OMATIC_VIDEO_SINK_H
#include <boost/shared_ptr.hpp>
#include "util.h"