diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-04 02:29:38 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-04 02:30:07 +0100 |
| commit | 781fd58838caec4a881582f4ba36f32eb1594000 (patch) | |
| tree | 3b8c49a8d0f053b070526df3d7d2218e90ec7925 /libavresample | |
| parent | 4b8bc6d2b0a94c850f7d807a7da21804f1f9c1c7 (diff) | |
| parent | cc976a75dffa148d655b52604331679ff669e8a2 (diff) | |
| download | ffmpeg-781fd58838caec4a881582f4ba36f32eb1594000.tar.gz | |
Merge commit 'cc976a75dffa148d655b52604331679ff669e8a2'
* commit 'cc976a75dffa148d655b52604331679ff669e8a2':
audio_mix: print (SKIP) instead of 0.0 for matrix columns removed along with output zeroing
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample')
| -rw-r--r-- | libavresample/audio_mix.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavresample/audio_mix.c b/libavresample/audio_mix.c index 514a7d9125..989891d0f6 100644 --- a/libavresample/audio_mix.c +++ b/libavresample/audio_mix.c @@ -729,7 +729,7 @@ int ff_audio_mix_set_matrix(AudioMix *am, const double *matrix, int stride) for (i = 0; i < am->in_channels; i++) { if (am->output_zero[o]) av_log(am->avr, AV_LOG_DEBUG, " (ZERO)"); - else if (am->input_skip[i] || am->output_skip[o]) + else if (am->input_skip[i] || am->output_zero[i] || am->output_skip[o]) av_log(am->avr, AV_LOG_DEBUG, " (SKIP)"); else av_log(am->avr, AV_LOG_DEBUG, " %0.3f ", |