X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Fsubtitle.c;h=cb51537e6cb1b6d12bcdd82c87d0c85cf09c01c1;hb=99c7892b3746862456ec379b9157f03833d9603c;hp=8ba4e95154395e28cb63b349821b27b9f98db140;hpb=719151d261197f0a865d0afec5f1d273a884f648;p=vlc 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; }