Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-1.1
Commits
99c7892b
Commit
99c7892b
authored
May 13, 2008
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Put psb in NEWS, interface and options.
parent
719151d2
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
4 deletions
+6
-4
NEWS
NEWS
+1
-0
include/vlc_interface.h
include/vlc_interface.h
+1
-1
modules/demux/subtitle.c
modules/demux/subtitle.c
+4
-3
No files found.
NEWS
View file @
99c7892b
...
...
@@ -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
...
...
include/vlc_interface.h
View file @
99c7892b
...
...
@@ -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
...
...
modules/demux/subtitle.c
View file @
99c7892b
...
...
@@ -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
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment