Merge.

diff --combined src/lib/subtitle_content.cc
index 7792f3ef6fafd7a8b9ed84963828e964558dbad9,df90a4a1a2630056693bad3623de40935088c8ea..f10fa58b2d2588fc69fb8dd75287f9bc1d7f6202
--- 1/src/lib/subtitle_content.cc
--- 2/src/lib/subtitle_content.cc
+++ b/src/lib/subtitle_content.cc
@@@ -90,7 -90,7 +90,7 @@@ SubtitleContent::SubtitleContent (share
                _subtitle_x_scale = _subtitle_y_scale = node->number_child<float> ("SubtitleScale");
        }
  
-       _subtitle_language = node->optional_string_child ("SubtitleLanguage");
+       _subtitle_language = node->optional_string_child ("SubtitleLanguage").get_value_or ("");
  }
  
  SubtitleContent::SubtitleContent (shared_ptr<const Film> f, vector<shared_ptr<Content> > c)
@@@ -139,9 -139,7 +139,13 @@@ SubtitleContent::as_xml (xmlpp::Node* r
        root->add_child("SubtitleYOffset")->add_child_text (raw_convert<string> (_subtitle_y_offset));
        root->add_child("SubtitleXScale")->add_child_text (raw_convert<string> (_subtitle_x_scale));
        root->add_child("SubtitleYScale")->add_child_text (raw_convert<string> (_subtitle_y_scale));
++<<<<<<< HEAD
 +      if (_subtitle_language) {
 +              root->add_child("SubtitleLanguage")->add_child_text (_subtitle_language.get ());
 +      }
++=======
+       root->add_child("SubtitleLanguage")->add_child_text (_subtitle_language);
++>>>>>>> 30a2bb95980d74a33baeb18d18f2e4ac72d66845
  }
  
  void

diff --combined src/lib/subtitle_content.h
index 39a3f32ebb4b6c715ce0cc7b5d09afa4d4954c8d,4cbef657ab5b18da060024ee4bd13f608e53552e..e74164f774b4cb97c671737101e64901fb1d4c63
--- 1/src/lib/subtitle_content.h
--- 2/src/lib/subtitle_content.h
+++ b/src/lib/subtitle_content.h
@@@ -84,10 -84,14 +84,14 @@@ public
                return _subtitle_y_scale;
        }
  
-       boost::optional<std::string> subtitle_language () const {
+       std::string subtitle_language () const {
                return _subtitle_language;
        }
  
+ protected:
+       /** subtitle language (e.g. "German") or empty if it is not known */
+       std::string _subtitle_language;
+       
  private:
        friend struct ffmpeg_pts_offset_test;
  
@@@ -104,8 -108,6 +108,8 @@@
        double _subtitle_x_scale;
        /** y scale factor to apply to subtitles */
        double _subtitle_y_scale;
 +
 +      boost::optional<std::string> _subtitle_language;
  };
  
  #endif