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
a593a9cc
Commit
a593a9cc
authored
Jan 02, 2008
by
Jean-Paul Saman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert [23694] because the fix was bad.
parent
ec0dd014
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
7 deletions
+8
-7
modules/stream_out/transcode.c
modules/stream_out/transcode.c
+8
-7
No files found.
modules/stream_out/transcode.c
View file @
a593a9cc
...
...
@@ -1353,13 +1353,13 @@ static int transcode_audio_new( sout_stream_t *p_stream,
es_format_Init
(
&
id
->
p_encoder
->
fmt_in
,
AUDIO_ES
,
VLC_FOURCC
(
'f'
,
'l'
,
'3'
,
'2'
)
);
id
->
p_encoder
->
fmt_in
.
audio
.
i_format
=
VLC_FOURCC
(
'f'
,
'l'
,
'3'
,
'2'
);
id
->
p_encoder
->
fmt_in
.
audio
.
i_rate
=
id
->
p_
de
coder
->
fmt_out
.
audio
.
i_rate
;
id
->
p_encoder
->
fmt_in
.
audio
.
i_rate
=
id
->
p_
en
coder
->
fmt_out
.
audio
.
i_rate
;
id
->
p_encoder
->
fmt_in
.
audio
.
i_physical_channels
=
id
->
p_
de
coder
->
fmt_out
.
audio
.
i_physical_channels
;
id
->
p_
en
coder
->
fmt_out
.
audio
.
i_physical_channels
;
id
->
p_encoder
->
fmt_in
.
audio
.
i_original_channels
=
id
->
p_
de
coder
->
fmt_out
.
audio
.
i_original_channels
;
id
->
p_
en
coder
->
fmt_out
.
audio
.
i_original_channels
;
id
->
p_encoder
->
fmt_in
.
audio
.
i_channels
=
id
->
p_
de
coder
->
fmt_out
.
audio
.
i_channels
;
id
->
p_
en
coder
->
fmt_out
.
audio
.
i_channels
;
id
->
p_encoder
->
fmt_in
.
audio
.
i_bitspersample
=
audio_BitsPerSample
(
id
->
p_encoder
->
fmt_in
.
i_codec
);
...
...
@@ -1378,9 +1378,9 @@ static int transcode_audio_new( sout_stream_t *p_stream,
audio_BitsPerSample
(
id
->
p_encoder
->
fmt_in
.
i_codec
);
/* Fix AAC SBR changing number of channels and sampling rate */
if
(
(
id
->
p_decoder
->
fmt_in
.
i_codec
==
VLC_FOURCC
(
'm'
,
'p'
,
'4'
,
'a'
)
)
&&
(
fmt_last
.
audio
.
i_rate
!=
id
->
p_encoder
->
fmt_in
.
audio
.
i_rate
)
&&
(
fmt_last
.
audio
.
i_channels
!=
id
->
p_encoder
->
fmt_in
.
audio
.
i_channels
)
)
if
(
id
->
p_decoder
->
fmt_in
.
i_codec
==
VLC_FOURCC
(
'm'
,
'p'
,
'4'
,
'a'
)
&&
fmt_last
.
audio
.
i_rate
!=
id
->
p_encoder
->
fmt_in
.
audio
.
i_rate
&&
fmt_last
.
audio
.
i_channels
!=
id
->
p_encoder
->
fmt_in
.
audio
.
i_channels
)
{
id
->
p_encoder
->
fmt_in
.
audio
.
i_rate
=
fmt_last
.
audio
.
i_rate
;
id
->
p_encoder
->
fmt_out
.
audio
.
i_rate
=
fmt_last
.
audio
.
i_rate
;
...
...
@@ -2781,6 +2781,7 @@ static int transcode_spu_process( sout_stream_t *p_stream,
return
VLC_SUCCESS
;
}
}
return
VLC_EGENERIC
;
}
...
...
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