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
a7c1a3eb
Commit
a7c1a3eb
authored
Sep 30, 2009
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
audio filters can return NULL, handle it properly
parent
35d52735
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
3 deletions
+13
-3
src/audio_output/input.c
src/audio_output/input.c
+10
-2
src/audio_output/output.c
src/audio_output/output.c
+3
-1
No files found.
src/audio_output/input.c
View file @
a7c1a3eb
...
...
@@ -546,6 +546,8 @@ int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * p_input,
/* Run pre-filters. */
aout_FiltersPlay
(
p_aout
,
p_input
->
pp_filters
,
p_input
->
i_nb_filters
,
&
p_buffer
);
if
(
!
p_buffer
)
return
0
;
/* Actually run the resampler now. */
if
(
p_input
->
i_nb_resamplers
>
0
)
...
...
@@ -556,9 +558,11 @@ int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * p_input,
&
p_buffer
);
}
if
(
!
p_buffer
)
return
0
;
if
(
p_buffer
->
i_nb_samples
<=
0
)
{
aout_BufferFre
e
(
p_buffer
);
block_Releas
e
(
p_buffer
);
return
0
;
}
#endif
...
...
@@ -643,6 +647,8 @@ int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * p_input,
#ifndef AOUT_PROCESS_BEFORE_CHEKS
/* Run pre-filters. */
aout_FiltersPlay
(
p_input
->
pp_filters
,
p_input
->
i_nb_filters
,
&
p_buffer
);
if
(
!
p_buffer
)
return
0
;
#endif
/* Run the resampler if needed.
...
...
@@ -735,9 +741,11 @@ int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * p_input,
&
p_buffer
);
}
if
(
!
p_buffer
)
return
0
;
if
(
p_buffer
->
i_nb_samples
<=
0
)
{
aout_BufferFre
e
(
p_buffer
);
block_Releas
e
(
p_buffer
);
return
0
;
}
#endif
...
...
src/audio_output/output.c
View file @
a7c1a3eb
...
...
@@ -249,9 +249,11 @@ void aout_OutputPlay( aout_instance_t * p_aout, aout_buffer_t * p_buffer )
aout_FiltersPlay
(
p_aout
->
output
.
pp_filters
,
p_aout
->
output
.
i_nb_filters
,
&
p_buffer
);
if
(
!
p_buffer
)
return
;
if
(
p_buffer
->
i_buffer
==
0
)
{
aout_BufferFre
e
(
p_buffer
);
block_Releas
e
(
p_buffer
);
return
;
}
...
...
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