[FFmpeg-devel] [PATCH v1 1/3] avutil/avstring: Fix warning: ISO C90 forbids mixed declarations and code

lance.lmwang at gmail.com lance.lmwang at gmail.com
Mon Jan 13 15:44:49 EET 2020


From: Limin Wang <lance.lmwang at gmail.com>

Signed-off-by: Limin Wang <lance.lmwang at gmail.com>
---
 libavutil/avstring.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/libavutil/avstring.c b/libavutil/avstring.c
index 76a13ba..f4b8ed2 100644
--- a/libavutil/avstring.c
+++ b/libavutil/avstring.c
@@ -258,15 +258,17 @@ char *av_strireplace(const char *str, const char *from, const char *to)
 const char *av_basename(const char *path)
 {
     char *p;
+#if HAVE_DOS_PATHS
+    char *q, *d;
+#endif
 
     if (!path || *path == '\0')
         return ".";
 
     p = strrchr(path, '/');
 #if HAVE_DOS_PATHS
-    char *q = strrchr(path, '\\');
-    char *d = strchr(path, ':');
-
+    q = strrchr(path, '\\');
+    d = strchr(path, ':');
     p = FFMAX3(p, q, d);
 #endif
 
-- 
2.9.5



More information about the ffmpeg-devel mailing list