diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-21 21:47:43 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-21 21:47:43 +0200 |
| commit | 2bfd4ff16dddc46d30b9e3510cb31e3b1b1b90fe (patch) | |
| tree | 0d5cf2ee61c86b14375481cc46efd72fc9da6ce6 | |
| parent | 4f49c39a2fec85435fd0aabd5a402d9fa11b2fea (diff) | |
| parent | 593aaee953f8b07c141ff115e67bae85ef0350c7 (diff) | |
Merge commit '593aaee953f8b07c141ff115e67bae85ef0350c7'
* commit '593aaee953f8b07c141ff115e67bae85ef0350c7':
setpts: Add missing inttypes.h #include for PRId64
Conflicts:
libavfilter/setpts.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavfilter/setpts.c | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/libavfilter/setpts.c b/libavfilter/setpts.c index 0db021814d..92b07fb3c6 100644 --- a/libavfilter/setpts.c +++ b/libavfilter/setpts.c @@ -24,6 +24,8 @@ * video presentation timestamp (PTS) modification filter */ +#include <inttypes.h> + #include "libavutil/eval.h" #include "libavutil/internal.h" #include "libavutil/mathematics.h" @@ -175,24 +177,24 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) d = av_expr_eval(setpts->expr, setpts->var_values, NULL); frame->pts = D2TS(d); - av_log(inlink->dst, AV_LOG_DEBUG, - "N:%"PRId64" PTS:%s T:%f POS:%s", - (int64_t)setpts->var_values[VAR_N], - d2istr(setpts->var_values[VAR_PTS]), - setpts->var_values[VAR_T], - d2istr(setpts->var_values[VAR_POS])); + av_dlog(inlink->dst, + "N:%"PRId64" PTS:%s T:%f POS:%s", + (int64_t)setpts->var_values[VAR_N], + d2istr(setpts->var_values[VAR_PTS]), + setpts->var_values[VAR_T], + d2istr(setpts->var_values[VAR_POS])); switch (inlink->type) { case AVMEDIA_TYPE_VIDEO: - av_log(inlink->dst, AV_LOG_DEBUG, " INTERLACED:%"PRId64, - (int64_t)setpts->var_values[VAR_INTERLACED]); + av_dlog(inlink->dst, " INTERLACED:%"PRId64, + (int64_t)setpts->var_values[VAR_INTERLACED]); break; case AVMEDIA_TYPE_AUDIO: - av_log(inlink->dst, AV_LOG_DEBUG, " NB_SAMPLES:%"PRId64" NB_CONSUMED_SAMPLES:%"PRId64, - (int64_t)setpts->var_values[VAR_NB_SAMPLES], - (int64_t)setpts->var_values[VAR_NB_CONSUMED_SAMPLES]); + av_dlog(inlink->dst, " 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_log(inlink->dst, AV_LOG_DEBUG, " -> PTS:%s T:%f\n", d2istr(d), TS2T(d, inlink->time_base)); + av_dlog(inlink->dst, " -> 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; |