From 99c7892b3746862456ec379b9157f03833d9603c Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Kempf Date: Tue, 13 May 2008 12:48:01 -0700 Subject: [PATCH] Put psb in NEWS, interface and options. --- NEWS | 1 + include/vlc_interface.h | 2 +- modules/demux/subtitle.c | 7 ++++--- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/NEWS b/NEWS index 3299fb8de6..651fcd8ac9 100644 --- a/NEWS +++ b/NEWS @@ -108,6 +108,7 @@ Subtitles: * JacoSub subtitles basic support * MPL2 subtitles support * Rewrite of ASS/SSA scripts and subtitles support. + * PowerDivx (.psb) Subtitles support Encoders: * Flash Screen Video support diff --git a/include/vlc_interface.h b/include/vlc_interface.h index ec0aedf137..faac4dafd6 100644 --- a/include/vlc_interface.h +++ b/include/vlc_interface.h @@ -203,7 +203,7 @@ typedef enum vlc_dialog { EXTENSIONS_PLAYLIST #define EXTENSIONS_SUBTITLE "*.cdg;*.idx;*.srt;*.sub;*.utf;*.ass;*.ssa;*.aqt;" \ - "*.jss" + "*.jss;*.psb" /** \defgroup vlc_interaction Interaction * \ingroup vlc_interface diff --git a/modules/demux/subtitle.c b/modules/demux/subtitle.c index 8ba4e95154..cb51537e6c 100644 --- a/modules/demux/subtitle.c +++ b/modules/demux/subtitle.c @@ -59,13 +59,13 @@ static void Close( vlc_object_t *p_this ); N_("Force the subtiles format. Valid values are : \"microdvd\", " \ "\"subrip\", \"ssa1\", \"ssa2-4\", \"ass\", \"vplayer\" " \ "\"sami\", \"dvdsubtitle\", \"mpl2\", \"aqt\", \"pjs\" "\ - "\"mpsub\" \"jacosub\" and \"auto\" (meaning autodetection, this " \ + "\"mpsub\" \"jacosub\" \"psb\" and \"auto\" (meaning autodetection, this " \ "should always work).") static const char *ppsz_sub_type[] = { "auto", "microdvd", "subrip", "subviewer", "ssa1", "ssa2-4", "ass", "vplayer", "sami", "dvdsubtitle", "mpl2", - "aqt", "pjs", "mpsub", "jacosub" + "aqt", "pjs", "mpsub", "jacosub", "psb" }; vlc_module_begin(); @@ -369,7 +369,8 @@ static int Open ( vlc_object_t *p_this ) { p_sys->i_type = SUB_TYPE_PJS; } - else if( sscanf( s, "{%d:%d:%d}", &i_dummy, &i_dummy, &i_dummy ) == 3 ) + else if( sscanf( s, "{%d:%d:%d}", + &i_dummy, &i_dummy, &i_dummy ) == 3 ) { p_sys->i_type = SUB_TYPE_PSB; } -- 2.39.2