Changeset 107cc2a5cfefa78d0d0ee8eb5729f5d355aef018

Show
Ignore:
Timestamp:
10/06/05 20:50:32 (3 years ago)
Author:
Clément Stenac <zorglub@videolan.org>
git-committer:
Clément Stenac <zorglub@videolan.org> 1118429432 +0000
git-parent:

[05f6442d23806a7b1266d7c5fa537551351a1cc4]

git-author:
Clément Stenac <zorglub@videolan.org> 1118429432 +0000
Message:

Remove i263 from stream output dialogs. Closes #187

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/gui/macosx/output.m

    r6f405b8 r107cc2a  
    132132    NSArray *o_a_codecs = [NSArray arrayWithObjects: @"mpga", @"mp3 ", @"mp4a", @"a52 ", @"vorb", @"flac", @"spx ", nil]; 
    133133    NSArray *o_v_codecs = [NSArray arrayWithObjects: @"mp1v", @"mp2v", @"mp4v", @"DIV1", 
    134         @"DIV2", @"DIV3", @"h263", @"h264", @"I263", @"WMV1", @"WMV2", @"MJPG", @"theo", nil]; 
     134        @"DIV2", @"DIV3", @"h263", @"h264", @"WMV1", @"WMV2", @"MJPG", @"theo", nil]; 
    135135 
    136136    [o_output_ckbox setTitle: _NS("Advanced output:")]; 

  • modules/gui/pda/pda.glade

    r5f6c3bf r107cc2a  
    19501950                      <property name="can_focus">True</property> 
    19511951                      <property name="label">H263</property> 
    1952                     </widget> 
    1953                   </child> 
    1954  
    1955                   <child> 
    1956                     <widget class="GtkListItem" id="listitem3164"> 
    1957                       <property name="visible">True</property> 
    1958                       <property name="can_focus">True</property> 
    1959                       <property name="label">I263</property> 
    19601952                    </widget> 
    19611953                  </child> 

  • modules/gui/pda/pda_interface.c

    r90917b8 r107cc2a  
    921921  comboVideoCodec_items = g_list_append (comboVideoCodec_items, (gpointer) _("mp4v")); 
    922922  comboVideoCodec_items = g_list_append (comboVideoCodec_items, (gpointer) _("H263")); 
    923   comboVideoCodec_items = g_list_append (comboVideoCodec_items, (gpointer) _("I263")); 
    924923  comboVideoCodec_items = g_list_append (comboVideoCodec_items, (gpointer) _("WMV1")); 
    925924  comboVideoCodec_items = g_list_append (comboVideoCodec_items, (gpointer) _("WMV2")); 

  • modules/gui/wxwindows/streamdata.h

    r3f98fbe r107cc2a  
    2626 
    2727// Do not count dummy here ! 
    28 #define VCODECS_NUMBER 13 
     28#define VCODECS_NUMBER 12 
    2929#define ACODECS_NUMBER 9 
    3030 
    …… 
    7171       { MUX_TS, MUX_AVI, -1,-1,-1,-1,-1,-1,-1 } }, 
    7272    { "H 264" , "H264" , N_("H264 is a new video codec") , 
    73        { MUX_TS, MUX_AVI, -1,-1,-1,-1,-1,-1,-1 } }, 
    74     { "I 263", "I263", N_("I263 is an Intel conferencing codec") , 
    7573       { MUX_TS, MUX_AVI, -1,-1,-1,-1,-1,-1,-1 } }, 
    7674    { "WMV 1" , "WMV1", N_("WMV (Windows Media Video) 1") , 

  • modules/gui/wxwindows/streamout.cpp

    r030c921 r107cc2a  
    695695        wxT("H263"), 
    696696        wxT("h264"), 
    697         wxT("I263"), 
    698697        wxT("WMV1"), 
    699698        wxT("WMV2"),