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
/
dcp_subtitle_decoder.cc
diff --git
a/src/lib/dcp_subtitle_decoder.cc
b/src/lib/dcp_subtitle_decoder.cc
index c1f0ab500bd54962a8780133181e04426462c0d2..20a9f32fee031ddd99fc03f19ab1d5182614e6f7 100644
(file)
--- a/
src/lib/dcp_subtitle_decoder.cc
+++ b/
src/lib/dcp_subtitle_decoder.cc
@@
-22,6
+22,7
@@
#include "dcp_subtitle_content.h"
using std::list;
+using std::cout;
using boost::shared_ptr;
DCPSubtitleDecoder::DCPSubtitleDecoder (shared_ptr<const DCPSubtitleContent> content)
@@
-55,7
+56,7
@@
DCPSubtitleDecoder::pass ()
s.push_back (*_next);
text_subtitle (s);
++_next;
-
+
return false;
}