projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0
[dcpomatic.git]
/
src
/
lib
/
playlist.h
diff --git
a/src/lib/playlist.h
b/src/lib/playlist.h
index 9e3dbb6dfbf39ccf2f6f6864d1ee2920983ff447..91051e9c4752353f6fe79a4793b69850dc6f81a3 100644
(file)
--- a/
src/lib/playlist.h
+++ b/
src/lib/playlist.h
@@
-20,13
+20,13
@@
#ifndef DCPOMATIC_PLAYLIST_H
#define DCPOMATIC_PLAYLIST_H
#ifndef DCPOMATIC_PLAYLIST_H
#define DCPOMATIC_PLAYLIST_H
-#include <list>
-#include <boost/shared_ptr.hpp>
-#include <boost/enable_shared_from_this.hpp>
#include "ffmpeg_content.h"
#include "audio_mapping.h"
#include "util.h"
#include "frame_rate_change.h"
#include "ffmpeg_content.h"
#include "audio_mapping.h"
#include "util.h"
#include "frame_rate_change.h"
+#include <boost/shared_ptr.hpp>
+#include <boost/enable_shared_from_this.hpp>
+#include <list>
class Content;
class FFmpegContent;
class Content;
class FFmpegContent;