Skip to content

V
vlc
Commit 5a6b0ace authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files
Options

* backport [13450]

parent f0b769b1
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
modules/gui/macosx/wizard.m
View file @ 5a6b0ace
...@@ -134,11 +134,11 @@ static VLCWizard *_o_sharedInstance = nil; ...@@ -134,11 +134,11 @@ static VLCWizard *_o_sharedInstance = nil;
_NS("DivX third version (useable with MPEG TS, MPEG1, ASF and OGG)"), \ _NS("DivX third version (useable with MPEG TS, MPEG1, ASF and OGG)"), \
@"MUX_TS", @"MUX_MPEG", @"MUX_ASF", @"MUX_OGG", @"NO", @"NO", @"NO", \ @"MUX_TS", @"MUX_MPEG", @"MUX_ASF", @"MUX_OGG", @"NO", @"NO", @"NO", \
@"NO", @"NO", nil]; @"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 " \ _NS("H263 is a video codec optimized for videoconference " \
"(low rates, useable with MPEG TS)"), @"MUX_TS", @"NO", @"NO", @"NO", \ "(low rates, useable with MPEG TS)"), @"MUX_TS", @"NO", @"NO", @"NO", \
@"NO", @"NO", @"NO", @"NO", @"NO", nil]; @"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)"), \ _NS("H264 is a new video codec (useable with MPEG TS and MP4)"), \
@"MUX_TS", @"MUX_MP4", @"NO", @"NO", @"NO", @"NO", @"NO", @"NO", \ @"MUX_TS", @"MUX_MP4", @"NO", @"NO", @"NO", @"NO", @"NO", @"NO", \
@"NO", nil]; @"NO", nil];
......
modules/gui/wxwidgets/streamdata.cpp
View file @ 5a6b0ace
...@@ -50,10 +50,10 @@ const struct codec vcodecs_array[] = ...@@ -50,10 +50,10 @@ const struct codec vcodecs_array[] =
{ "DIVX 3" ,"DIV3",N_("DivX third version (useable with MPEG TS, MPEG1, ASF" \ { "DIVX 3" ,"DIV3",N_("DivX third version (useable with MPEG TS, MPEG1, ASF" \
" and OGG)") , " and OGG)") ,
{MUX_TS , MUX_MPEG , MUX_ASF , MUX_OGG , -1 , -1,-1,-1,-1 } }, {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)") , "(low rates, useable with MPEG TS)") ,
{ MUX_TS, -1, -1,-1,-1,-1,-1,-1,-1 } }, { 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)") , "and MPEG4)") ,
{ MUX_TS, MUX_MP4, MUX_ASF,-1,-1,-1,-1,-1,-1 } }, { 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, " \ { "WMV 1" , "WMV1", N_("WMV (Windows Media Video) 7 (useable with MPEG TS, " \
......
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