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
/
transcoder.cc
diff --git
a/src/lib/transcoder.cc
b/src/lib/transcoder.cc
index ef3a0e8c1af6c52edcd2920fab34861b8220e457..6744e9193ce9d415d1ad36eeceedd9f52f25ac83 100644
(file)
--- a/
src/lib/transcoder.cc
+++ b/
src/lib/transcoder.cc
@@
-34,7
+34,7
@@
#include "gain.h"
#include "video_decoder.h"
#include "audio_decoder.h"
-#include "play
list
.h"
+#include "play
er
.h"
using std::string;
using boost::shared_ptr;