aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-08-23 03:15:51 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-08-23 03:15:51 +0200
commit5ac46a0969a3c86422794c838b681c75fda6b25e (patch)
tree0aefa5796f62a7bd8854d8e3e3ff3d2aee9b2e21
parent8b55f67e3ee3dabb11877aa0df2ba56d1423be43 (diff)
parent37e2d574ddcedc25e32bd963737b033354543789 (diff)
downloadffmpeg-5ac46a0969a3c86422794c838b681c75fda6b25e.tar.gz
Merge commit '37e2d574ddcedc25e32bd963737b033354543789' into release/2.2
* commit '37e2d574ddcedc25e32bd963737b033354543789': setpts: Add missing inttypes.h #include for PRId64 Conflicts: libavfilter/setpts.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavfilter/setpts.c24
1 files changed, 13 insertions, 11 deletions
diff --git a/libavfilter/setpts.c b/libavfilter/setpts.c
index cb6b2b9aab..172a110aef 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,21 +177,21 @@ 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));