am 81bf15ac: Merge "First step of refactoring \'timedtext\' code."

* commit '81bf15ac36c27f068fe770d32c247673bd98a068':
  First step of refactoring 'timedtext' code.