virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-08 13:22:53 +02:00
Code Issues Releases Activity

lavfi/overlay: fix debug PTS output in try_filter_frame()

Browse Source 
The PTS of the input frames must be interpreted according to the input
timebase, which is not the same as the output timebase.
This commit is contained in:
Stefano Sabatini 2013-03-31 09:51:59 +02:00
parent 874173002e
commit 39aad43465
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavfilter/vf_overlay.c
View File

@ -495,7 +495,6 @@ static void blend_image(AVFilterContext *ctx,
static int try_filter_frame(AVFilterContext *ctx, AVFrame *mainpic) static int try_filter_frame(AVFilterContext *ctx, AVFrame *mainpic)
{ {
OverlayContext *over = ctx->priv; OverlayContext *over = ctx->priv;
AVFilterLink *outlink = ctx->outputs[0];
AVFrame *next_overpic; AVFrame *next_overpic;
int ret; int ret;
@ -521,10 +520,10 @@ static int try_filter_frame(AVFilterContext *ctx, AVFrame *mainpic)
/* At this point, we know that the current overlay frame extends to the /* At this point, we know that the current overlay frame extends to the
* time of the main frame. */ * time of the main frame. */
av_dlog(ctx, "main_pts:%s main_pts_time:%s", av_dlog(ctx, "main_pts:%s main_pts_time:%s",
av_ts2str(mainpic->pts), av_ts2timestr(mainpic->pts, &outlink->time_base)); av_ts2str(mainpic->pts), av_ts2timestr(mainpic->pts, &ctx->inputs[MAIN]->time_base));
if (over->overpicref) if (over->overpicref)
av_dlog(ctx, " over_pts:%s over_pts_time:%s", av_dlog(ctx, " over_pts:%s over_pts_time:%s",
av_ts2str(over->overpicref->pts), av_ts2timestr(over->overpicref->pts, &outlink->time_base)); av_ts2str(over->overpicref->pts), av_ts2timestr(over->overpicref->pts, &ctx->inputs[OVERLAY]->time_base));
av_dlog(ctx, "\n"); av_dlog(ctx, "\n");
if (over->overpicref) if (over->overpicref)