Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Steve Lhomme
VLC
Commits
4a8900b3
Commit
4a8900b3
authored
Aug 24, 2003
by
hartman
Browse files
* backwards compatibilty with older faad2 lib
parent
e9a2d322
Changes
1
Hide whitespace changes
Inline
Side-by-side
modules/codec/faad/decoder.c
View file @
4a8900b3
...
...
@@ -2,7 +2,7 @@
* decoder.c: AAC decoder using libfaad2
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
* $Id: decoder.c,v 1.2
7
2003/08/2
3 16:15:47 fenrir
Exp $
* $Id: decoder.c,v 1.2
8
2003/08/2
4 00:34:13 hartman
Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
...
...
@@ -393,8 +393,11 @@ static void DecodeThread( adec_thread_t *p_adec )
/* **** First check if we have a valid output **** */
if
(
(
!
p_adec
->
p_aout_input
)
||
(
p_adec
->
output_format
.
i_original_channels
!=
pi_channels_maps
[
faad_frame
.
channels
]
)
||
(
p_adec
->
output_format
.
i_rate
!=
faad_frame
.
samplerate
)
)
(
p_adec
->
output_format
.
i_original_channels
!=
pi_channels_maps
[
faad_frame
.
channels
]
)
#ifndef HAVE_OLD_FAAD2
||
(
p_adec
->
output_format
.
i_rate
!=
faad_frame
.
samplerate
)
#endif
)
{
if
(
p_adec
->
p_aout_input
)
{
...
...
@@ -406,7 +409,9 @@ static void DecodeThread( adec_thread_t *p_adec )
p_adec
->
output_format
.
i_physical_channels
=
p_adec
->
output_format
.
i_original_channels
=
pi_channels_maps
[
faad_frame
.
channels
];
#ifndef HAVE_OLD_FAAD2
p_adec
->
output_format
.
i_rate
=
faad_frame
.
samplerate
;
#endif
aout_DateInit
(
&
p_adec
->
date
,
p_adec
->
output_format
.
i_rate
);
p_adec
->
p_aout_input
=
aout_DecNew
(
p_adec
->
p_fifo
,
...
...
Write
Preview
Supports
Markdown
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