Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
FFmpeg
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
libremedia
Tethys
FFmpeg
Commits
b90632d5
Commit
b90632d5
authored
12 years ago
by
Justin Ruggles
Browse files
Options
Downloads
Patches
Plain Diff
lavr: always reset mix function names and pointers in mix_function_init()
CC: libav-stable@libav.org
parent
f07ef2d9
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
libavresample/audio_mix.c
+4
-3
4 additions, 3 deletions
libavresample/audio_mix.c
with
4 additions
and
3 deletions
libavresample/audio_mix.c
+
4
−
3
View file @
b90632d5
...
...
@@ -284,11 +284,12 @@ static void mix_2_to_6_fltp_flt_c(float **samples, float **matrix, int len,
static
int
mix_function_init
(
AudioMix
*
am
)
{
am
->
func_descr
=
am
->
func_descr_generic
=
"n/a"
;
am
->
mix
=
am
->
mix_generic
=
NULL
;
/* no need to set a mix function when we're skipping mixing */
if
(
!
am
->
in_matrix_channels
||
!
am
->
out_matrix_channels
)
{
am
->
func_descr
=
"n/a"
;
if
(
!
am
->
in_matrix_channels
||
!
am
->
out_matrix_channels
)
return
0
;
}
/* any-to-any C versions */
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment