Commit 107cc2a5 authored by Clément Stenac's avatar Clément Stenac

Remove i263 from stream output dialogs. Closes #187

parent 05f6442d
......@@ -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...")];
......
......@@ -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>
......
......@@ -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);
......
......@@ -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") ,
......
......@@ -694,7 +694,6 @@ wxPanel *SoutDialog::TranscodingPanel( wxWindow* parent )
wxT("DIV3"),
wxT("H263"),
wxT("h264"),
wxT("I263"),
wxT("WMV1"),
wxT("WMV2"),
wxT("MJPG"),
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment