diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-20 03:19:29 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-20 03:19:47 +0200 |
| commit | 40d552dae657d2d690a724c8b1e7ea714998d74f (patch) | |
| tree | 43534ea3562526771f95b821b9e8cbbd7573d24e /libavresample/audio_mix.c | |
| parent | 8e8219e0f0725116809cdd1c17c868cb08da0dec (diff) | |
| parent | 1a3eb042c704dea190c644def5b32c9cee8832b8 (diff) | |
| download | ffmpeg-40d552dae657d2d690a724c8b1e7ea714998d74f.tar.gz | |
Merge commit '1a3eb042c704dea190c644def5b32c9cee8832b8'
* commit '1a3eb042c704dea190c644def5b32c9cee8832b8':
Replace av_dlog with normal av_log at trace level
Conflicts:
ffplay.c
libavdevice/fbdev_dec.c
libavfilter/avfilter.c
libavfilter/internal.h
libavfilter/setpts.c
libavfilter/src_movie.c
libavfilter/vf_crop.c
libavfilter/vf_drawtext.c
libavfilter/vf_fieldorder.c
libavformat/assdec.c
libavformat/avidec.c
libavformat/flvdec.c
libavformat/http.c
libavformat/ipmovie.c
libavformat/isom.c
libavformat/mov.c
libavformat/mpegenc.c
libavformat/mpegts.c
libavformat/mpegtsenc.c
libavformat/mux.c
libavformat/mxfdec.c
libavformat/nsvdec.c
libavformat/oggdec.c
libavformat/r3d.c
libavformat/rtspdec.c
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample/audio_mix.c')
| -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 9df1865002..7ae0aeb74d 100644 --- a/libavresample/audio_mix.c +++ b/libavresample/audio_mix.c @@ -441,7 +441,7 @@ int ff_audio_mix(AudioMix *am, AudioData *src) use_generic = 0; } } - av_dlog(am->avr, "audio_mix: %d samples - %d to %d channels (%s)\n", + av_log(am->avr, AV_LOG_TRACE, "audio_mix: %d samples - %d to %d channels (%s)\n", src->nb_samples, am->in_channels, am->out_channels, use_generic ? am->func_descr_generic : am->func_descr); |