Put psb in NEWS, interface and options.

diff --git a/NEWS b/NEWS
index 3299fb8de64f4942e583549dacd36ee317e435c7..651fcd8ac90fb8adc7daa715604f2e4bbf97ca35 100644 (file)
--- 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 ec0aedf1376cea9952ce6eef010c58e8afd36007..faac4dafd65845833fe09742773cbeac3e0d5e63 100644 (file)
--- 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 8ba4e95154395e28cb63b349821b27b9f98db140..cb51537e6cb1b6d12bcdd82c87d0c85cf09c01c1 100644 (file)
--- 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;
             }