diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-10-26 19:13:38 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-10-26 19:13:38 +0100 |
| commit | 4bc307976d6378698ae9faa2b0a14352639ffbe2 (patch) | |
| tree | 3f5118577edeeeb3c82ea20cb79fce0c826a5167 | |
| parent | e602bfaa857c564c19945bbad4ce21196705142c (diff) | |
| parent | 72b72371d9dbfc96bb7d2fa5b687205a08dddccc (diff) | |
Merge branch 'master' of ssh://carlh.dnsalias.org/home/carl/git/libdcp
| -rw-r--r-- | src/asset.h | 1 | ||||
| -rw-r--r-- | src/subtitle_asset.cc | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/asset.h b/src/asset.h index c40ec91b..492f16be 100644 --- a/src/asset.h +++ b/src/asset.h @@ -25,6 +25,7 @@ #define LIBDCP_ASSET_H #include <string> +#include <list> #include <boost/filesystem.hpp> #include "types.h" diff --git a/src/subtitle_asset.cc b/src/subtitle_asset.cc index 9f1aa9d9..15ddb2a8 100644 --- a/src/subtitle_asset.cc +++ b/src/subtitle_asset.cc @@ -401,7 +401,7 @@ SubtitleAsset::write_xml () /* XXX: script, underlined, weight not supported */ bool first = true; - bool italic; + bool italic = false; Color color; int size = 0; Effect effect = NONE; |