avresample: use valid log context in mixing functions
authorHendrik Leppkes <h.leppkes@gmail.com>
Sun, 16 Dec 2012 08:52:35 +0000 (09:52 +0100)
committerJustin Ruggles <justin.ruggles@gmail.com>
Mon, 17 Dec 2012 00:59:58 +0000 (19:59 -0500)
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
libavresample/audio_mix.c

index 62f8bd6..2b3d9f1 100644 (file)
@@ -467,13 +467,13 @@ int ff_audio_mix_get_matrix(AudioMix *am, double *matrix, int stride)
 
     if ( am->in_channels <= 0 ||  am->in_channels > AVRESAMPLE_MAX_CHANNELS ||
         am->out_channels <= 0 || am->out_channels > AVRESAMPLE_MAX_CHANNELS) {
 
     if ( am->in_channels <= 0 ||  am->in_channels > AVRESAMPLE_MAX_CHANNELS ||
         am->out_channels <= 0 || am->out_channels > AVRESAMPLE_MAX_CHANNELS) {
-        av_log(am, AV_LOG_ERROR, "Invalid channel counts\n");
+        av_log(am->avr, AV_LOG_ERROR, "Invalid channel counts\n");
         return AVERROR(EINVAL);
     }
 
 #define GET_MATRIX_CONVERT(suffix, scale)                                   \
     if (!am->matrix_ ## suffix[0]) {                                        \
         return AVERROR(EINVAL);
     }
 
 #define GET_MATRIX_CONVERT(suffix, scale)                                   \
     if (!am->matrix_ ## suffix[0]) {                                        \
-        av_log(am, AV_LOG_ERROR, "matrix is not set\n");                    \
+        av_log(am->avr, AV_LOG_ERROR, "matrix is not set\n");               \
         return AVERROR(EINVAL);                                             \
     }                                                                       \
     for (o = 0; o < am->out_channels; o++)                                  \
         return AVERROR(EINVAL);                                             \
     }                                                                       \
     for (o = 0; o < am->out_channels; o++)                                  \
@@ -491,7 +491,7 @@ int ff_audio_mix_get_matrix(AudioMix *am, double *matrix, int stride)
         GET_MATRIX_CONVERT(flt, 1.0);
         break;
     default:
         GET_MATRIX_CONVERT(flt, 1.0);
         break;
     default:
-        av_log(am, AV_LOG_ERROR, "Invalid mix coeff type\n");
+        av_log(am->avr, AV_LOG_ERROR, "Invalid mix coeff type\n");
         return AVERROR(EINVAL);
     }
 
         return AVERROR(EINVAL);
     }
 
@@ -504,7 +504,7 @@ int ff_audio_mix_set_matrix(AudioMix *am, const double *matrix, int stride)
 
     if ( am->in_channels <= 0 ||  am->in_channels > AVRESAMPLE_MAX_CHANNELS ||
         am->out_channels <= 0 || am->out_channels > AVRESAMPLE_MAX_CHANNELS) {
 
     if ( am->in_channels <= 0 ||  am->in_channels > AVRESAMPLE_MAX_CHANNELS ||
         am->out_channels <= 0 || am->out_channels > AVRESAMPLE_MAX_CHANNELS) {
-        av_log(am, AV_LOG_ERROR, "Invalid channel counts\n");
+        av_log(am->avr, AV_LOG_ERROR, "Invalid channel counts\n");
         return AVERROR(EINVAL);
     }
 
         return AVERROR(EINVAL);
     }
 
@@ -540,7 +540,7 @@ int ff_audio_mix_set_matrix(AudioMix *am, const double *matrix, int stride)
         CONVERT_MATRIX(flt, v)
         break;
     default:
         CONVERT_MATRIX(flt, v)
         break;
     default:
-        av_log(am, AV_LOG_ERROR, "Invalid mix coeff type\n");
+        av_log(am->avr, AV_LOG_ERROR, "Invalid mix coeff type\n");
         return AVERROR(EINVAL);
     }
 
         return AVERROR(EINVAL);
     }