* fix transcoding using H.264 / H.263. The change in the wx-intf needs testing.

diff --git a/modules/gui/macosx/wizard.m b/modules/gui/macosx/wizard.m
index 43eb0acb2bbec42f246960b72d21da5a3140a9b9..e1a71a4f14b558c64090184bddb25762ef66d75e 100644 (file)
--- a/modules/gui/macosx/wizard.m
+++ b/modules/gui/macosx/wizard.m
@@ -134,11 +134,11 @@ static VLCWizard *_o_sharedInstance = nil;
         _NS("DivX third version (useable with MPEG TS, MPEG1, ASF and OGG)"), \
         @"MUX_TS", @"MUX_MPEG", @"MUX_ASF", @"MUX_OGG", @"NO", @"NO", @"NO", \
         @"NO", @"NO", nil];
-    o_h263 = [NSArray arrayWithObjects: @"H.263", @"H263", \
+    o_h263 = [NSArray arrayWithObjects: @"H.263", @"h263", \
         _NS("H263 is a video codec optimized for videoconference " \
         "(low rates, useable with MPEG TS)"), @"MUX_TS", @"NO", @"NO", @"NO", \
         @"NO", @"NO", @"NO", @"NO", @"NO", nil];
-    o_h264 = [NSArray arrayWithObjects: @"H.264", @"H264", \
+    o_h264 = [NSArray arrayWithObjects: @"H.264", @"h264", \
         _NS("H264 is a new video codec (useable with MPEG TS and MP4)"), \
         @"MUX_TS", @"MUX_MP4", @"NO", @"NO", @"NO", @"NO", @"NO", @"NO", \
         @"NO", nil];

diff --git a/modules/gui/wxwidgets/streamdata.cpp b/modules/gui/wxwidgets/streamdata.cpp
index 9a061d6a81851d4c4aee37e47a4a7fecc519d4c5..94a6532ac5633a07d2f98d27738797947e9a1c1e 100644 (file)
--- a/modules/gui/wxwidgets/streamdata.cpp
+++ b/modules/gui/wxwidgets/streamdata.cpp
@@ -2,7 +2,7 @@
  * streamdata.cpp: streaming/transcoding data
  *****************************************************************************
  * Copyright (C) 2000-2005 the VideoLAN team
- * $Id: wizard.cpp 7826 2004-05-30 14:43:12Z zorglub $
+ * $Id$
  *
  * Authors: Clément Stenac <zorglub@videolan.org>
  *
@@ -50,10 +50,10 @@ const struct codec vcodecs_array[] =
     { "DIVX 3" ,"DIV3",N_("DivX third version (useable with MPEG TS, MPEG1, ASF" \
         " and OGG)") ,
        {MUX_TS , MUX_MPEG , MUX_ASF , MUX_OGG , -1 , -1,-1,-1,-1 } },
-    { "H 263" , "H263" , N_("H263 is a video codec optimized for videoconference " \
+    { "H 263" , "h263" , N_("H263 is a video codec optimized for videoconference " \
         "(low rates, useable with MPEG TS)") ,
        { MUX_TS, -1, -1,-1,-1,-1,-1,-1,-1 } },
-    { "H 264" , "H264" , N_("H264 is a new video codec (useable with MPEG TS " \
+    { "H 264" , "h264" , N_("H264 is a new video codec (useable with MPEG TS " \
         "and MPEG4)") ,
        { MUX_TS, MUX_MP4, MUX_ASF,-1,-1,-1,-1,-1,-1 } },
     { "WMV 1" , "WMV1", N_("WMV (Windows Media Video) 7 (useable with MPEG TS, " \