diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-01-29 20:02:56 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-01-29 20:02:56 +0000 |
| commit | bfe277e664a03ec47cd6bee7e1b1e4aca6eb38e6 (patch) | |
| tree | 6bdc6fa07f2cde0565c4025ab552f2c0fc9c3b2f /src/lib/image.h | |
| parent | 6a0da4eb43fc684c0f54a7a3a817a31dc8db7109 (diff) | |
| parent | 27867be66579551018c926ed3339624e463c1b08 (diff) | |
Merge branch '2.0' of git.carlh.net:git/dcpomatic into 2.0
Diffstat (limited to 'src/lib/image.h')
| -rw-r--r-- | src/lib/image.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/image.h b/src/lib/image.h index 22f3f6e50..814ad1c58 100644 --- a/src/lib/image.h +++ b/src/lib/image.h @@ -24,9 +24,9 @@ #ifndef DCPOMATIC_IMAGE_H #define DCPOMATIC_IMAGE_H -#include "util.h" #include "position.h" #include "position_image.h" +#include "types.h" #include <dcp/image.h> extern "C" { #include <libavcodec/avcodec.h> @@ -37,6 +37,7 @@ extern "C" { #include <string> class Scaler; +class Socket; class Image : public dcp::Image { |