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
e7003c92
Commit
e7003c92
authored
Mar 12, 2008
by
Rafaël Carré
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
verify asprintf() return value, fix indentation
parent
d95df6f6
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
17 additions
and
15 deletions
+17
-15
modules/codec/faad.c
modules/codec/faad.c
+17
-15
No files found.
modules/codec/faad.c
View file @
e7003c92
...
@@ -348,23 +348,25 @@ static aout_buffer_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
...
@@ -348,23 +348,25 @@ static aout_buffer_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
if
(
(
p_sys
->
b_sbr
!=
frame
.
sbr
||
p_sys
->
b_ps
!=
frame
.
ps
)
&&
if
(
(
p_sys
->
b_sbr
!=
frame
.
sbr
||
p_sys
->
b_ps
!=
frame
.
ps
)
&&
p_dec
->
p_parent
->
i_object_type
==
VLC_OBJECT_INPUT
)
p_dec
->
p_parent
->
i_object_type
==
VLC_OBJECT_INPUT
)
{
{
input_thread_t
*
p_input
=
(
input_thread_t
*
)
p_dec
->
p_parent
;
input_thread_t
*
p_input
=
(
input_thread_t
*
)
p_dec
->
p_parent
;
char
*
psz_cat
;
char
*
psz_cat
;
const
char
*
psz_ext
=
(
frame
.
sbr
&&
frame
.
ps
)
?
"SBR+PS"
:
const
char
*
psz_ext
=
(
frame
.
sbr
&&
frame
.
ps
)
?
"SBR+PS"
:
frame
.
sbr
?
"SBR"
:
"PS"
;
frame
.
sbr
?
"SBR"
:
"PS"
;
msg_Dbg
(
p_dec
,
"AAC %s (channels: %u, samplerate: %lu)"
,
msg_Dbg
(
p_dec
,
"AAC %s (channels: %u, samplerate: %lu)"
,
psz_ext
,
frame
.
channels
,
frame
.
samplerate
);
psz_ext
,
frame
.
channels
,
frame
.
samplerate
);
asprintf
(
&
psz_cat
,
_
(
"Stream %d"
),
p_dec
->
fmt_in
.
i_id
);
if
(
asprintf
(
&
psz_cat
,
_
(
"Stream %d"
),
p_dec
->
fmt_in
.
i_id
)
!=
-
1
)
input_Control
(
p_input
,
INPUT_ADD_INFO
,
psz_cat
,
{
_
(
"AAC extension"
),
"%s"
,
psz_ext
);
input_Control
(
p_input
,
INPUT_ADD_INFO
,
psz_cat
,
input_Control
(
p_input
,
INPUT_ADD_INFO
,
psz_cat
,
_
(
"AAC extension"
),
"%s"
,
psz_ext
);
_
(
"Channels"
),
"%d"
,
frame
.
channels
);
input_Control
(
p_input
,
INPUT_ADD_INFO
,
psz_cat
,
input_Control
(
p_input
,
INPUT_ADD_INFO
,
psz_cat
,
_
(
"Channels"
),
"%d"
,
frame
.
channels
);
_
(
"Sample rate"
),
_
(
"%d Hz"
),
frame
.
samplerate
);
input_Control
(
p_input
,
INPUT_ADD_INFO
,
psz_cat
,
free
(
psz_cat
);
_
(
"Sample rate"
),
_
(
"%d Hz"
),
frame
.
samplerate
);
p_sys
->
b_sbr
=
frame
.
sbr
;
p_sys
->
b_ps
=
frame
.
ps
;
free
(
psz_cat
);
}
p_sys
->
b_sbr
=
frame
.
sbr
;
p_sys
->
b_ps
=
frame
.
ps
;
}
}
/* Convert frame.channel_position to our own channel values */
/* Convert frame.channel_position to our own channel values */
...
...
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