X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavfilter%2Ff_metadata.c;h=2ed1393cbaa9ac1217cf686c5428dd743213d35d;hb=f166951d6e32d2776373721bc262d338c44a5d81;hp=523a94d38cb20844088ae0099ca26b79cb52e7c5;hpb=1a8be90adbaf86faa3053ff98118004ad7711c8c;p=ffmpeg

diff --git a/libavfilter/f_metadata.c b/libavfilter/f_metadata.c
index 523a94d38cb..2ed1393cbaa 100644
--- a/libavfilter/f_metadata.c
+++ b/libavfilter/f_metadata.c
@@ -54,6 +54,7 @@ enum MetadataFunction {
     METADATAF_EQUAL,
     METADATAF_GREATER,
     METADATAF_EXPR,
+    METADATAF_ENDS_WITH,
     METADATAF_NB
 };
 
@@ -107,6 +108,7 @@ static const AVOption filt_name##_options[] = { \
     {   "equal",       NULL, 0, AV_OPT_TYPE_CONST, {.i64 = METADATAF_EQUAL   },     0, 3, FLAGS, "function" }, \
     {   "greater",     NULL, 0, AV_OPT_TYPE_CONST, {.i64 = METADATAF_GREATER },     0, 3, FLAGS, "function" }, \
     {   "expr",        NULL, 0, AV_OPT_TYPE_CONST, {.i64 = METADATAF_EXPR    },     0, 3, FLAGS, "function" }, \
+    {   "ends_with",   NULL, 0, AV_OPT_TYPE_CONST, {.i64 = METADATAF_ENDS_WITH },   0, 0, FLAGS, "function" }, \
     { "expr", "set expression for expr function", OFFSET(expr_str), AV_OPT_TYPE_STRING, {.str = NULL }, 0, 0, FLAGS }, \
     { "file", "set file where to print metadata information", OFFSET(file_str), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 0, FLAGS }, \
     { NULL } \
@@ -122,6 +124,14 @@ static int starts_with(MetadataContext *s, const char *value1, const char *value
     return !strncmp(value1, value2, strlen(value2));
 }
 
+static int ends_with(MetadataContext *s, const char *value1, const char *value2)
+{
+    const int len1 = strlen(value1);
+    const int len2 = strlen(value2);
+
+    return !strncmp(value1 + FFMAX(len1 - len2, 0), value2, len2);
+}
+
 static int equal(MetadataContext *s, const char *value1, const char *value2)
 {
     float f1, f2;
@@ -212,6 +222,9 @@ static av_cold int init(AVFilterContext *ctx)
     case METADATAF_STARTS_WITH:
         s->compare = starts_with;
         break;
+    case METADATAF_ENDS_WITH:
+        s->compare = ends_with;
+        break;
     case METADATAF_LESS:
         s->compare = less;
         break;
@@ -270,6 +283,8 @@ static av_cold void uninit(AVFilterContext *ctx)
 {
     MetadataContext *s = ctx->priv;
 
+    av_expr_free(s->expr);
+    s->expr = NULL;
     if (s->avio_context) {
         avio_closep(&s->avio_context);
     }