summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorphintuka <phintuka>2012-01-09 07:29:11 +0000
committerphintuka <phintuka>2012-01-09 07:29:11 +0000
commit52a9a19b35766c1a486b7498e634603adce6dd52 (patch)
tree2d52264ada5936b6ca25fb0b1ee7ccdd0b2ceee8
parent0808bd2275ed71d465681cfc4a9aa62b56d075da (diff)
downloadxineliboutput-52a9a19b35766c1a486b7498e634603adce6dd52.tar.gz
xineliboutput-52a9a19b35766c1a486b7498e634603adce6dd52.tar.bz2
Added support for .ass subtitles to media player
(Thanks to zaverel)
-rw-r--r--HISTORY1
-rw-r--r--config.c6
2 files changed, 4 insertions, 3 deletions
diff --git a/HISTORY b/HISTORY
index f21a3b14..e6928c43 100644
--- a/HISTORY
+++ b/HISTORY
@@ -24,6 +24,7 @@ VDR Plugin 'xineliboutput' Revision History
- Implemented build-time configuration script
- Fixed aspect ratio problems when using ffmpeg mpeg2 decoder
- H.264 updates
+- Added support for .ass subtitles to media player (Thanks to zaverel)
2011-07-10: Version 1.0.7 (branch-1_0_x)
Backported bugfixes from CVS trunk:
diff --git a/config.c b/config.c
index 44ba8b69..b9f19a0e 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
* See the main source file 'xineliboutput.c' for copyright information and
* how to reach the author.
*
- * $Id: config.c,v 1.105 2011-07-10 21:35:22 phintuka Exp $
+ * $Id: config.c,v 1.106 2012-01-09 07:29:11 phintuka Exp $
*
*/
@@ -211,8 +211,8 @@ const char * const config_t::s_subtitleSizes[ SUBTITLESIZE_count+1 ] = {
};
const char * const config_t::s_subExts[] = {
- ".sub", ".srt", ".txt", ".ssa",
- ".SUB", ".SRT", ".TXT", ".SSA",
+ ".sub", ".srt", ".txt", ".ssa", "ass",
+ ".SUB", ".SRT", ".TXT", ".SSA", "ASS",
NULL
};