[SCM] libav/master: setpts: Add missing inttypes.h #include for PRId64

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Wed Sep 17 01:18:09 UTC 2014


The following commit has been merged in the master branch:
commit 63795fe5b967b93bd476aedfd6a9260b99355525
Author: Diego Biurrun <diego at biurrun.de>
Date:   Wed Aug 20 09:54:50 2014 -0700

    setpts: Add missing inttypes.h #include for PRId64
    
    Also convert a debug av_log() to av_dlog().
    
    (cherry picked from commit 593aaee953f8b07c141ff115e67bae85ef0350c7)
    Signed-off-by: Diego Biurrun <diego at biurrun.de>

diff --git a/libavfilter/setpts.c b/libavfilter/setpts.c
index ff0016d..fa7a0be 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"
@@ -141,15 +143,12 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame)
     d = av_expr_eval(setpts->expr, setpts->var_values, NULL);
     frame->pts = D2TS(d);
 
-#ifdef DEBUG
-    av_log(inlink->dst, AV_LOG_DEBUG,
-           "n:%"PRId64" interlaced:%d pts:%"PRId64" t:%f -> pts:%"PRId64" t:%f\n",
-           (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));
-#endif
-
+    av_dlog(inlink->dst,
+            "n:%"PRId64" interlaced:%d pts:%"PRId64" t:%f -> pts:%"PRId64" t:%f\n",
+            (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));
 
     if (inlink->type == AVMEDIA_TYPE_VIDEO) {
         setpts->var_values[VAR_N] += 1.0;

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list