diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-19 01:25:32 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-19 01:25:50 +0200 |
| commit | 602d0bfe67ce20e169433ca583153e5c01c84016 (patch) | |
| tree | 995e83b980b76935144df98082d73ddd43bbeb09 /libavfilter | |
| parent | f8ca8138f01d0a7d96d4e1ea65fecd1197f96206 (diff) | |
| parent | 2090abcc436df92969634577c91ea1d1143d4533 (diff) | |
Merge branch 'frame_num_offset' of https://github.com/mjmvisser/FFmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/vf_drawtext.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c index 157bfc72f9..7cafafefc7 100644 --- a/libavfilter/vf_drawtext.c +++ b/libavfilter/vf_drawtext.c @@ -164,6 +164,7 @@ typedef struct { AVTimecode tc; ///< timecode context int tc24hmax; ///< 1 if timecode is wrapped to 24 hours, 0 otherwise int reload; ///< reload text file for each frame + int start_number; ///< starting frame number for n/frame_num var } DrawTextContext; #define OFFSET(x) offsetof(DrawTextContext, x) @@ -198,6 +199,7 @@ static const AVOption drawtext_options[]= { {"rate", "set rate (timecode only)", OFFSET(tc_rate), AV_OPT_TYPE_RATIONAL, {.dbl=0}, 0, INT_MAX, FLAGS}, {"reload", "reload text file for each frame", OFFSET(reload), AV_OPT_TYPE_INT, {.i64=0}, 0, 1, FLAGS}, {"fix_bounds", "if true, check and fix text coords to avoid clipping", OFFSET(fix_bounds), AV_OPT_TYPE_INT, {.i64=1}, 0, 1, FLAGS}, + {"start_number", "start frame number for n/frame_num variable", OFFSET(start_number), AV_OPT_TYPE_INT, {.i64=0}, 0, INT_MAX, FLAGS}, /* FT_LOAD_* flags */ { "ft_load_flags", "set font loading flags for libfreetype", OFFSET(ft_load_flags), AV_OPT_TYPE_FLAGS, { .i64 = FT_LOAD_DEFAULT | FT_LOAD_RENDER}, 0, INT_MAX, FLAGS, "ft_load_flags" }, @@ -978,7 +980,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) if ((ret = load_textfile(ctx)) < 0) return ret; - s->var_values[VAR_N] = inlink->frame_count; + s->var_values[VAR_N] = inlink->frame_count+s->start_number; s->var_values[VAR_T] = frame->pts == AV_NOPTS_VALUE ? NAN : frame->pts * av_q2d(inlink->time_base); |