Remove i263 from stream output dialogs. Closes #187

diff --git a/modules/gui/macosx/output.m b/modules/gui/macosx/output.m
index 36c187771f6aadee1755ae2083770ccdbb6e8a65..66caa5616718877f5536998e26361ec6dc21ea8f 100644 (file)
--- a/modules/gui/macosx/output.m
+++ b/modules/gui/macosx/output.m
@@ -131,7 +131,7 @@
     NSArray *o_v_scales = [NSArray arrayWithObjects: @"0.25",@"0.5",@"0.75",@"1",@"1.25",@"1.5",@"1.75",@"2",nil];
     NSArray *o_a_codecs = [NSArray arrayWithObjects: @"mpga", @"mp3 ", @"mp4a", @"a52 ", @"vorb", @"flac", @"spx ", nil];
     NSArray *o_v_codecs = [NSArray arrayWithObjects: @"mp1v", @"mp2v", @"mp4v", @"DIV1",
-        @"DIV2", @"DIV3", @"h263", @"h264", @"I263", @"WMV1", @"WMV2", @"MJPG", @"theo", nil];
+        @"DIV2", @"DIV3", @"h263", @"h264", @"WMV1", @"WMV2", @"MJPG", @"theo", nil];
 
     [o_output_ckbox setTitle: _NS("Advanced output:")];
     [o_output_settings setTitle: _NS("Settings...")];

diff --git a/modules/gui/pda/pda.glade b/modules/gui/pda/pda.glade
index f8f2e96cdf4d38468d89147bedf165acaf780448..b901b237996ef01463d12726ae3a1c7a03dc7847 100644 (file)
--- a/modules/gui/pda/pda.glade
+++ b/modules/gui/pda/pda.glade
@@ -1952,14 +1952,6 @@
                                    </widget>
                                  </child>
 
-                                 <child>
-                                   <widget class="GtkListItem" id="listitem3164">
-                                     <property name="visible">True</property>
-                                     <property name="can_focus">True</property>
-                                     <property name="label">I263</property>
-                                   </widget>
-                                 </child>
-
                                  <child>
                                    <widget class="GtkListItem" id="listitem3165">
                                      <property name="visible">True</property>

diff --git a/modules/gui/pda/pda_interface.c b/modules/gui/pda/pda_interface.c
index dca1cb515fa499f4f7958b9170674087f81e466c..dfaecbd42bfdb982da973eaa87762f96b82a077d 100644 (file)
--- a/modules/gui/pda/pda_interface.c
+++ b/modules/gui/pda/pda_interface.c
@@ -920,7 +920,6 @@ create_pda (void)
   comboVideoCodec_items = g_list_append (comboVideoCodec_items, (gpointer) _("mp2v"));
   comboVideoCodec_items = g_list_append (comboVideoCodec_items, (gpointer) _("mp4v"));
   comboVideoCodec_items = g_list_append (comboVideoCodec_items, (gpointer) _("H263"));
-  comboVideoCodec_items = g_list_append (comboVideoCodec_items, (gpointer) _("I263"));
   comboVideoCodec_items = g_list_append (comboVideoCodec_items, (gpointer) _("WMV1"));
   comboVideoCodec_items = g_list_append (comboVideoCodec_items, (gpointer) _("WMV2"));
   gtk_combo_set_popdown_strings (GTK_COMBO (comboVideoCodec), comboVideoCodec_items);

diff --git a/modules/gui/wxwindows/streamdata.h b/modules/gui/wxwindows/streamdata.h
index 24d548ff63787cdfba2fa9dcb6eb9962332e6d94..a25bdb3da62ed9a14607e1390b6185bbf4ab37bf 100644 (file)
--- a/modules/gui/wxwindows/streamdata.h
+++ b/modules/gui/wxwindows/streamdata.h
@@ -25,7 +25,7 @@
 #define MUXERS_NUMBER 9
 
 // Do not count dummy here !
-#define VCODECS_NUMBER 13
+#define VCODECS_NUMBER 12
 #define ACODECS_NUMBER 9
 
 #define MUX_PS          0
@@ -71,8 +71,6 @@ static struct codec vcodecs_array[] =
        { MUX_TS, MUX_AVI, -1,-1,-1,-1,-1,-1,-1 } },
     { "H 264" , "H264" , N_("H264 is a new video codec") ,
        { MUX_TS, MUX_AVI, -1,-1,-1,-1,-1,-1,-1 } },
-    { "I 263", "I263", N_("I263 is an Intel conferencing codec") ,
-       { MUX_TS, MUX_AVI, -1,-1,-1,-1,-1,-1,-1 } },
     { "WMV 1" , "WMV1", N_("WMV (Windows Media Video) 1") ,
        {MUX_TS , MUX_MPEG , MUX_ASF , MUX_OGG , -1 , -1,-1,-1,-1 } },
     { "WMV 2" , "WMV2", N_("WMV (Windows Media Video) 2") ,

diff --git a/modules/gui/wxwindows/streamout.cpp b/modules/gui/wxwindows/streamout.cpp
index 97543b262e603e70c28f4196b78604e10e3fd8c1..cf7b574e20c10c886aaa404ba22653e483f0da0c 100644 (file)
--- a/modules/gui/wxwindows/streamout.cpp
+++ b/modules/gui/wxwindows/streamout.cpp
@@ -694,7 +694,6 @@ wxPanel *SoutDialog::TranscodingPanel( wxWindow* parent )
         wxT("DIV3"),
         wxT("H263"),
         wxT("h264"),
-        wxT("I263"),
         wxT("WMV1"),
         wxT("WMV2"),
         wxT("MJPG"),