[FFmpeg-cvslog] fftools/cmdutils: Use av_strstart instead of strncmp

Andreas Rheinhardt git at videolan.org
Sun Feb 28 18:43:49 EET 2021


ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at gmail.com> | Wed Feb 24 07:41:27 2021 +0100| [bd85c63d1d7e9d5e60cbde5c1dcd8d3911e67de3] | committer: Andreas Rheinhardt

fftools/cmdutils: Use av_strstart instead of strncmp

It makes the intent clearer and avoids searching for a delimiter
in advance.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bd85c63d1d7e9d5e60cbde5c1dcd8d3911e67de3
---

 fftools/cmdutils.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c
index 4eb68d2201..fe253d10a4 100644
--- a/fftools/cmdutils.c
+++ b/fftools/cmdutils.c
@@ -215,11 +215,9 @@ void show_help_children(const AVClass *class, int flags)
 
 static const OptionDef *find_option(const OptionDef *po, const char *name)
 {
-    const char *p = strchr(name, ':');
-    int len = p ? p - name : strlen(name);
-
     while (po->name) {
-        if (!strncmp(name, po->name, len) && strlen(po->name) == len)
+        const char *end;
+        if (av_strstart(name, po->name, &end) && (!*end || *end == ':'))
             break;
         po++;
     }



More information about the ffmpeg-cvslog mailing list