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 /libavfilter/setpts.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 'libavfilter/setpts.c')
| -rw-r--r-- | libavfilter/setpts.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavfilter/setpts.c b/libavfilter/setpts.c index 92b07fb3c6..dbfd88d218 100644 --- a/libavfilter/setpts.c +++ b/libavfilter/setpts.c @@ -177,7 +177,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) d = av_expr_eval(setpts->expr, setpts->var_values, NULL); frame->pts = D2TS(d); - av_dlog(inlink->dst, + av_log(inlink->dst, AV_LOG_TRACE, "N:%"PRId64" PTS:%s T:%f POS:%s", (int64_t)setpts->var_values[VAR_N], d2istr(setpts->var_values[VAR_PTS]), @@ -185,16 +185,16 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) d2istr(setpts->var_values[VAR_POS])); switch (inlink->type) { case AVMEDIA_TYPE_VIDEO: - av_dlog(inlink->dst, " INTERLACED:%"PRId64, + av_log(inlink->dst, AV_LOG_TRACE, " INTERLACED:%"PRId64, (int64_t)setpts->var_values[VAR_INTERLACED]); break; case AVMEDIA_TYPE_AUDIO: - av_dlog(inlink->dst, " NB_SAMPLES:%"PRId64" NB_CONSUMED_SAMPLES:%"PRId64, + av_log(inlink->dst, AV_LOG_TRACE, " NB_SAMPLES:%"PRId64" NB_CONSUMED_SAMPLES:%"PRId64, (int64_t)setpts->var_values[VAR_NB_SAMPLES], (int64_t)setpts->var_values[VAR_NB_CONSUMED_SAMPLES]); break; } - av_dlog(inlink->dst, " -> PTS:%s T:%f\n", d2istr(d), TS2T(d, inlink->time_base)); + av_log(inlink->dst, AV_LOG_TRACE, " -> PTS:%s T:%f\n", d2istr(d), TS2T(d, inlink->time_base)); if (inlink->type == AVMEDIA_TYPE_VIDEO) { setpts->var_values[VAR_N] += 1.0; |