diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-12-22 23:35:23 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-12-22 23:35:23 +0000 |
| commit | e651d843c513e8dbf0967735ea702a3795ac321d (patch) | |
| tree | 8fe8bc07b60d7de3d561c7d1e45e63429fb7baec | |
| parent | f5cc57f11946e1e269df25db434c5f8efe953a68 (diff) | |
A couple more little fixes to subtitle XML.
| -rwxr-xr-x | run-tests.sh | 2 | ||||
| -rw-r--r-- | src/subtitle_asset.cc | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/run-tests.sh b/run-tests.sh index b6064db3..3c92dae0 100755 --- a/run-tests.sh +++ b/run-tests.sh @@ -53,6 +53,8 @@ for d in `find build/test/libdcp-test -mindepth 1 -maxdepth 1 -type d`; do fi done +sed -i "s/DCP: build\/test/DCP: \.\./g" build/test/info2.log + diff -q build/test/info2.log ../libdcp-test/info.log if [ "$?" != "0" ]; then echo "FAIL: dcpinfo output from rewrite incorrect" diff --git a/src/subtitle_asset.cc b/src/subtitle_asset.cc index 9ba85a43..c7051eae 100644 --- a/src/subtitle_asset.cc +++ b/src/subtitle_asset.cc @@ -469,7 +469,7 @@ SubtitleAsset::write_xml (ostream& s) const a << "Script=\"normal\" Underlined=\"no\" Weight=\"normal\""; } - if (first || + if (first || font_changed || (last_in != (*i)->in() || last_out != (*i)->out() || last_fade_up_time != (*i)->fade_up_time() || |