Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-1.1
Commits
911e1f49
Commit
911e1f49
authored
Nov 29, 2005
by
Felix Paul Kühne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* fix transcoding using H.264 / H.263. The change in the wx-intf needs testing.
parent
addc88a8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
modules/gui/macosx/wizard.m
modules/gui/macosx/wizard.m
+2
-2
modules/gui/wxwidgets/streamdata.cpp
modules/gui/wxwidgets/streamdata.cpp
+3
-3
No files found.
modules/gui/macosx/wizard.m
View file @
911e1f49
...
@@ -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"
,
@"
H
263"
,
\
o_h263
=
[
NSArray
arrayWithObjects
:
@"H.263"
,
@"
h
263"
,
\
_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"
,
@"
H
264"
,
\
o_h264
=
[
NSArray
arrayWithObjects
:
@"H.264"
,
@"
h
264"
,
\
_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 @
911e1f49
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* streamdata.cpp: streaming/transcoding data
* streamdata.cpp: streaming/transcoding data
*****************************************************************************
*****************************************************************************
* Copyright (C) 2000-2005 the VideoLAN team
* Copyright (C) 2000-2005 the VideoLAN team
* $Id
: wizard.cpp 7826 2004-05-30 14:43:12Z zorglub
$
* $Id$
*
*
* Authors: Clment Stenac <zorglub@videolan.org>
* Authors: Clment Stenac <zorglub@videolan.org>
*
*
...
@@ -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"
,
"
H
263"
,
N_
(
"H263 is a video codec optimized for videoconference "
\
{
"H 263"
,
"
h
263"
,
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"
,
"
H
264"
,
N_
(
"H264 is a new video codec (useable with MPEG TS "
\
{
"H 264"
,
"
h
264"
,
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, "
\
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment