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
/
scaler.h
diff --git
a/src/lib/scaler.h
b/src/lib/scaler.h
index c80f4b7dbf76a21679ca8033b8283f838d938ca6..a736e92de0a269b37821fa51b725845c4872bca3 100644
(file)
--- a/
src/lib/scaler.h
+++ b/
src/lib/scaler.h
@@
-21,8
+21,8
@@
* @brief A class to describe one of FFmpeg's software scalers.
*/
-#ifndef D
VD
OMATIC_SCALER_H
-#define D
VD
OMATIC_SCALER_H
+#ifndef D
CP
OMATIC_SCALER_H
+#define D
CP
OMATIC_SCALER_H
#include <string>
#include <vector>