[libav-stable] lavr: always reset mix function names and pointers in mix_function_init()

Reinhard Tartler siretart at gmail.com
Thu Jan 24 11:56:19 CET 2013


On Fri, Jan 18, 2013 at 1:24 AM, Justin Ruggles <git at libav.org> wrote:
> Module: libav
> Branch: master
> Commit: b90632d5964d3998bab7323468a6b43ab6a24b34
>
> Author:    Justin Ruggles <justin.ruggles at gmail.com>
> Committer: Justin Ruggles <justin.ruggles at gmail.com>
> Date:      Wed Jan 16 14:18:38 2013 -0500
>
> lavr: always reset mix function names and pointers in mix_function_init()
>
> CC: libav-stable at libav.org
>
> ---
>
>  libavresample/audio_mix.c |    7 ++++---
>  1 files changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/libavresample/audio_mix.c b/libavresample/audio_mix.c
> index 7ed32d8..c701bf1 100644
> --- a/libavresample/audio_mix.c
> +++ b/libavresample/audio_mix.c
> @@ -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;
> -    }
>

This patch does not cleanly apply for release/9. Justin, can you have
a look, do you want to backport it or shall we drop it?

-- 
regards,
    Reinhard


More information about the libav-stable mailing list