[libav-devel] [PATCH] avresample: use valid log context in mixing functions

[Hendrik Leppkes]

---
 libavresample/audio_mix.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/libavresample/audio_mix.c b/libavresample/audio_mix.c
index 62f8bd6..acddb31 100644
--- a/libavresample/audio_mix.c
+++ b/libavresample/audio_mix.c
@@ -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) {
-        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]) {                                        \
-        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++)                                  \
@@ -491,7 +491,7 @@ int ff_audio_mix_get_matrix(AudioMix *am, double *matrix, 
int stride)
         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);
     }
 
@@ -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) {
-        av_log(am, AV_LOG_ERROR, "Invalid channel counts\n");
+        av_log(am->avr, AV_LOG_ERROR, "Invalid channel counts\n");
         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:
-        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);
     }
 
-- 
1.8.0.msysgit.0

_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel