diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-09-19 21:45:22 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-09-19 21:45:22 +0200 |
| commit | c7916079e06d985121842962b9736a6673e22dfe (patch) | |
| tree | 05720c8df69b8a8a27f69cef7152ff24d242cfff /src/lib/text_content.h | |
| parent | c269ebfdae53a2f5c5e9acc6f6588ebb47eeac9d (diff) | |
Fix failure to open v2.14.x documents with invalid or empty subtitle languages (#2085).
Diffstat (limited to 'src/lib/text_content.h')
| -rw-r--r-- | src/lib/text_content.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/text_content.h b/src/lib/text_content.h index 4c6918a42..d3e9b564b 100644 --- a/src/lib/text_content.h +++ b/src/lib/text_content.h @@ -69,8 +69,8 @@ class TextContent : public ContentPart { public: TextContent (Content* parent, TextType type, TextType original_type); - TextContent (Content* parent, std::vector<std::shared_ptr<Content> >); - TextContent (Content* parent, cxml::ConstNodePtr, int version); + TextContent (Content* parent, std::vector<std::shared_ptr<Content>>); + TextContent (Content* parent, cxml::ConstNodePtr, int version, std::list<std::string>& notes); void as_xml (xmlpp::Node *) const; std::string identifier () const; @@ -197,7 +197,7 @@ public: return _language_is_additional; } - static std::list<std::shared_ptr<TextContent>> from_xml (Content* parent, cxml::ConstNodePtr, int version); + static std::list<std::shared_ptr<TextContent>> from_xml (Content* parent, cxml::ConstNodePtr, int version, std::list<std::string>& notes); private: friend struct ffmpeg_pts_offset_test; |