diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-10-09 10:50:26 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-10-09 10:50:26 +0100 |
| commit | 5d398836a9b6acc2bbb536dabbd7bbc42a098659 (patch) | |
| tree | 7f613198c979212efb4e82a6f6250576a0edecef /src/lib/writer.cc | |
| parent | 568e553f506809e753c78a0e0cbad5906bc002b1 (diff) | |
| parent | 833d037185b37863d10adaa967c251038d9038e5 (diff) | |
Fix merge.
Diffstat (limited to 'src/lib/writer.cc')
| -rw-r--r-- | src/lib/writer.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/lib/writer.cc b/src/lib/writer.cc index caa37c211..5e8fb5b7a 100644 --- a/src/lib/writer.cc +++ b/src/lib/writer.cc @@ -19,13 +19,12 @@ #include <fstream> #include <cerrno> +#include <libdcp/mono_picture_asset.h> +#include <libdcp/stereo_picture_asset.h> #include <libdcp/sound_asset.h> -#include <libdcp/picture_frame.h> #include <libdcp/reel.h> #include <libdcp/dcp.h> #include <libdcp/cpl.h> -#include <libdcp/mono_picture_asset.h> -#include <libdcp/stereo_picture_asset.h> #include "writer.h" #include "compose.hpp" #include "film.h" |