diff options
author | Tobias Rapp <t.rapp@noa-archive.com> | 2016-04-07 11:20:53 +0300 |
---|---|---|
committer | Paul B Mahol <onemda@gmail.com> | 2016-04-13 09:39:07 +0300 |
commit | ee104580c5b83e0fe697a66c2638b56d584c0081 (patch) | |
tree | e8baadc61834aa74d745e20bfc0d37ed6466b982 /libavfilter/vf_drawtext.c | |
parent | 3674a53d171028c5bb1692dd80a3cd113bd7ff8b (diff) |
avfilter/vf_drawtext: add optional default value to metadata function
Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>
Diffstat (limited to 'libavfilter/vf_drawtext.c')
-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 1ef3ecb31f..6b9af5b425 100644 --- a/libavfilter/vf_drawtext.c +++ b/libavfilter/vf_drawtext.c @@ -860,6 +860,8 @@ static int func_metadata(AVFilterContext *ctx, AVBPrint *bp, if (e && e->value) av_bprintf(bp, "%s", e->value); + else if (argc >= 2) + av_bprintf(bp, "%s", argv[1]); return 0; } @@ -975,7 +977,7 @@ static const struct drawtext_function { { "localtime", 0, 1, 'L', func_strftime }, { "frame_num", 0, 0, 0, func_frame_num }, { "n", 0, 0, 0, func_frame_num }, - { "metadata", 1, 1, 0, func_metadata }, + { "metadata", 1, 2, 0, func_metadata }, }; static int eval_function(AVFilterContext *ctx, AVBPrint *bp, char *fct, |