Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
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
Commits
024d9217
Commit
024d9217
authored
Sep 09, 2003
by
Derk-Jan Hartman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix the condition for old faad.
Incorrect placing of logical operator
parent
cb1976ed
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
modules/codec/faad/decoder.c
modules/codec/faad/decoder.c
+3
-3
No files found.
modules/codec/faad/decoder.c
View file @
024d9217
...
...
@@ -2,7 +2,7 @@
* decoder.c: AAC decoder using libfaad2
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
* $Id: decoder.c,v 1.3
0 2003/09/02 20:19:25 gbazi
n Exp $
* $Id: decoder.c,v 1.3
1 2003/09/09 12:36:24 hartma
n Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
...
...
@@ -394,9 +394,9 @@ 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
]
||
!=
pi_channels_maps
[
faad_frame
.
channels
]
#ifndef HAVE_OLD_FAAD2
(
faad_frame
.
samplerate
&&
||
(
faad_frame
.
samplerate
&&
p_adec
->
output_format
.
i_rate
!=
faad_frame
.
samplerate
)
#endif
)
...
...
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