Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
03c6c686
Commit
03c6c686
authored
Aug 17, 2006
by
Gildas Bazin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* modules/stream_out/transcode.c: couple of small fixes.
parent
d42739f8
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
16 deletions
+8
-16
modules/stream_out/transcode.c
modules/stream_out/transcode.c
+8
-16
No files found.
modules/stream_out/transcode.c
View file @
03c6c686
...
...
@@ -514,8 +514,8 @@ static int Open( vlc_object_t *p_this )
if
(
p_sys
->
i_acodec
)
{
if
(
(
strncmp
(
(
char
*
)
&
p_sys
->
i_acodec
,
"mp3"
,
3
)
==
0
)
&&
(
p_sys
->
i_channels
>
2
)
)
if
(
p_sys
->
i_acodec
==
VLC_FOURCC
(
'm'
,
'p'
,
'3'
,
0
)
&&
p_sys
->
i_channels
>
2
)
{
msg_Warn
(
p_stream
,
"%d channels invalid for mp3, forcing to 2"
,
p_sys
->
i_channels
);
...
...
@@ -662,28 +662,20 @@ static int Open( vlc_object_t *p_this )
p_sys
->
i_canvas_height
=
val
.
i_int
;
var_Get
(
p_stream
,
SOUT_CFG_PREFIX
"canvas-aspect"
,
&
val
);
if
(
val
.
psz_string
)
p_sys
->
i_canvas_aspect
=
0
;
if
(
val
.
psz_string
&&
*
val
.
psz_string
)
{
char
*
psz_parser
=
strchr
(
val
.
psz_string
,
':'
);
if
(
psz_parser
)
{
*
psz_parser
++
=
'\0'
;
p_sys
->
i_canvas_aspect
=
atoi
(
val
.
psz_string
)
*
VOUT_ASPECT_FACTOR
/
atoi
(
psz_parser
);
}
else
{
msg_Warn
(
p_stream
,
"bad aspect ratio %s"
,
val
.
psz_string
);
p_sys
->
i_canvas_aspect
=
0
;
p_sys
->
i_canvas_aspect
=
atoi
(
val
.
psz_string
)
*
VOUT_ASPECT_FACTOR
/
atoi
(
psz_parser
);
}
else
msg_Warn
(
p_stream
,
"bad aspect ratio %s"
,
val
.
psz_string
);
free
(
val
.
psz_string
);
}
else
{
p_sys
->
i_canvas_aspect
=
0
;
}
if
(
val
.
psz_string
)
free
(
val
.
psz_string
);
var_Get
(
p_stream
,
SOUT_CFG_PREFIX
"threads"
,
&
val
);
p_sys
->
i_threads
=
val
.
i_int
;
...
...
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