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/resample.c | |
parent | 8e8219e0f0725116809cdd1c17c868cb08da0dec (diff) | |
parent | 1a3eb042c704dea190c644def5b32c9cee8832b8 (diff) |
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/resample.c')
-rw-r--r-- | libavresample/resample.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavresample/resample.c b/libavresample/resample.c index 4ae3075e2b..674336d3a9 100644 --- a/libavresample/resample.c +++ b/libavresample/resample.c @@ -485,7 +485,7 @@ int ff_audio_resample(ResampleContext *c, AudioData *dst, AudioData *src) ff_audio_data_drain(c->buffer, consumed); c->initial_padding_samples = FFMAX(c->initial_padding_samples - consumed, 0); - av_dlog(c->avr, "resampled %d in + %d leftover to %d out + %d leftover\n", + av_log(c->avr, AV_LOG_TRACE, "resampled %d in + %d leftover to %d out + %d leftover\n", in_samples, in_leftover, out_samples, c->buffer->nb_samples); dst->nb_samples = out_samples; |