projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge still/moving image classes.
[dcpomatic.git]
/
src
/
lib
/
playlist.cc
diff --git
a/src/lib/playlist.cc
b/src/lib/playlist.cc
index 8f40c9e6d7eed254ca6af288b70fff091d6c0aaa..e2a3c34861a0e7f148c9e39fe34f55ddbb1eedd2 100644
(file)
--- a/
src/lib/playlist.cc
+++ b/
src/lib/playlist.cc
@@
-26,8
+26,7
@@
#include "video_content.h"
#include "ffmpeg_decoder.h"
#include "ffmpeg_content.h"
-#include "still_image_decoder.h"
-#include "still_image_content.h"
+#include "image_decoder.h"
#include "content_factory.h"
#include "job.h"
#include "config.h"