projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Untested merge of master.
[dcpomatic.git]
/
src
/
lib
/
video_sink.h
diff --git
a/src/lib/video_sink.h
b/src/lib/video_sink.h
index 32c7f3b384f145cbb1bf83ba6de63294675fa253..167d3980eb020531457f8240ddc99803483f3343 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"
#include <boost/shared_ptr.hpp>
#include "util.h"