summaryrefslogtreecommitdiffstats
path: root/libavresample
diff options
context:
space:
mode:
authorHendrik Leppkes <h.leppkes@gmail.com>2012-12-16 09:52:35 +0100
committerJustin Ruggles <justin.ruggles@gmail.com>2012-12-16 19:59:58 -0500
commit0cf3505930913d3584b215f6912de04ff41366e0 (patch)
treedb4f0721762a434fe58290a087b556bb87217717 /libavresample
parentf1c2915ce1ea36782e0aebd108cd48db53b03c8b (diff)
downloadffmpeg-streaming-0cf3505930913d3584b215f6912de04ff41366e0.zip
ffmpeg-streaming-0cf3505930913d3584b215f6912de04ff41366e0.tar.gz
avresample: use valid log context in mixing functions
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
Diffstat (limited to 'libavresample')
-rw-r--r--libavresample/audio_mix.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/libavresample/audio_mix.c b/libavresample/audio_mix.c
index 62f8bd6..2b3d9f1 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);
}
OpenPOWER on IntegriCloud