Commit 99c7892b authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Put psb in NEWS, interface and options.

parent 719151d2
......@@ -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
......
......@@ -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
......
......@@ -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;
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment