highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '37e2d574ddcedc25e32bd963737b033354543789' into release/2.2

Browse Source 
* commit '37e2d574ddcedc25e32bd963737b033354543789':
  setpts: Add missing inttypes.h #include for PRId64

Conflicts:
	libavfilter/setpts.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-08-23 03:15:51 +02:00
commit 5ac46a0969
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavfilter/setpts.c
View File

@ -24,6 +24,8 @@
* video presentation timestamp (PTS) modification filter * video presentation timestamp (PTS) modification filter
*/ */
#include <inttypes.h>
#include "libavutil/eval.h" #include "libavutil/eval.h"
#include "libavutil/internal.h" #include "libavutil/internal.h"
#include "libavutil/mathematics.h" #include "libavutil/mathematics.h"
@ -175,7 +177,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame)
d = av_expr_eval(setpts->expr, setpts->var_values, NULL); d = av_expr_eval(setpts->expr, setpts->var_values, NULL);
frame->pts = D2TS(d); frame->pts = D2TS(d);
av_log(inlink->dst, AV_LOG_DEBUG, av_dlog(inlink->dst,
"N:%"PRId64" PTS:%s T:%f POS:%s", "N:%"PRId64" PTS:%s T:%f POS:%s",
(int64_t)setpts->var_values[VAR_N], (int64_t)setpts->var_values[VAR_N],
d2istr(setpts->var_values[VAR_PTS]), d2istr(setpts->var_values[VAR_PTS]),
@ -183,11 +185,11 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame)
d2istr(setpts->var_values[VAR_POS])); d2istr(setpts->var_values[VAR_POS]));
switch (inlink->type) { switch (inlink->type) {
case AVMEDIA_TYPE_VIDEO: case AVMEDIA_TYPE_VIDEO:
av_log(inlink->dst, AV_LOG_DEBUG, " INTERLACED:%"PRId64, av_dlog(inlink->dst, " INTERLACED:%"PRId64,
(int64_t)setpts->var_values[VAR_INTERLACED]); (int64_t)setpts->var_values[VAR_INTERLACED]);
break; break;
case AVMEDIA_TYPE_AUDIO: case AVMEDIA_TYPE_AUDIO:
av_log(inlink->dst, AV_LOG_DEBUG, " NB_SAMPLES:%"PRId64" NB_CONSUMED_SAMPLES:%"PRId64, 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_SAMPLES],
(int64_t)setpts->var_values[VAR_NB_CONSUMED_SAMPLES]); (int64_t)setpts->var_values[VAR_NB_CONSUMED_SAMPLES]);
break; break;