Merge commit '593aaee953f8b07c141ff115e67bae85ef0350c7'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 21 Aug 2014 19:47:43 +0000 (21:47 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 21 Aug 2014 19:47:43 +0000 (21:47 +0200)
* commit '593aaee953f8b07c141ff115e67bae85ef0350c7':
  setpts: Add missing inttypes.h #include for PRId64

Conflicts:
libavfilter/setpts.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavfilter/setpts.c

@@@ -175,24 -143,12 +177,24 @@@ static int filter_frame(AVFilterLink *i
      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" interlaced:%d pts:%"PRId64" t:%f -> pts:%"PRId64" t:%f\n",
++            "N:%"PRId64" PTS:%s T:%f POS:%s",
+             (int64_t)setpts->var_values[VAR_N],
 -            (int)setpts->var_values[VAR_INTERLACED],
 -            in_pts, in_pts * av_q2d(inlink->time_base),
 -            frame->pts, frame->pts * av_q2d(inlink->time_base));
++            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;