Changeset 99c7892b3746862456ec379b9157f03833d9603c

Show
Ignore:
Timestamp:
05/13/08 21:48:01 (2 months ago)
Author:
Jean-Baptiste Kempf <jb@videolan.org>
git-committer:
Jean-Baptiste Kempf <jb@videolan.org> 1210708081 -0700
git-parent:

[719151d261197f0a865d0afec5f1d273a884f648]

git-author:
Jean-Baptiste Kempf <jb@videolan.org> 1210708081 -0700
Message:

Put psb in NEWS, interface and options.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • NEWS

    rb474765 r99c7892  
    109109 * MPL2 subtitles support 
    110110 * Rewrite of ASS/SSA scripts and subtitles support. 
     111 * PowerDivx (.psb) Subtitles support 
    111112 
    112113Encoders: 

  • include/vlc_interface.h

    rb474765 r99c7892  
    204204 
    205205#define EXTENSIONS_SUBTITLE "*.cdg;*.idx;*.srt;*.sub;*.utf;*.ass;*.ssa;*.aqt;" \ 
    206                             "*.jss" 
     206                            "*.jss;*.psb" 
    207207 
    208208/** \defgroup vlc_interaction Interaction 

  • modules/demux/subtitle.c

    r719151d r99c7892  
    6060    "\"subrip\",  \"ssa1\", \"ssa2-4\", \"ass\", \"vplayer\" " \ 
    6161    "\"sami\", \"dvdsubtitle\", \"mpl2\", \"aqt\", \"pjs\" "\ 
    62     "\"mpsub\" \"jacosub\" and \"auto\" (meaning autodetection, this " \ 
     62    "\"mpsub\" \"jacosub\" \"psb\" and \"auto\" (meaning autodetection, this " \ 
    6363    "should always work).") 
    6464static const char *ppsz_sub_type[] = 
    …… 
    6666    "auto", "microdvd", "subrip", "subviewer", "ssa1", 
    6767    "ssa2-4", "ass", "vplayer", "sami", "dvdsubtitle", "mpl2", 
    68     "aqt", "pjs", "mpsub", "jacosub" 
     68    "aqt", "pjs", "mpsub", "jacosub", "psb" 
    6969}; 
    7070 
    …… 
    370370                p_sys->i_type = SUB_TYPE_PJS; 
    371371            } 
    372             else if( sscanf( s, "{%d:%d:%d}", &i_dummy, &i_dummy, &i_dummy ) == 3 ) 
     372            else if( sscanf( s, "{%d:%d:%d}", 
     373                                &i_dummy, &i_dummy, &i_dummy ) == 3 ) 
    373374            { 
    374375                p_sys->i_type = SUB_TYPE_PSB;