[FFmpeg-cvslog] avutil/avstring: Fix warning: ISO C90 forbids mixed declarations and code
Limin Wang
git at videolan.org
Tue Jan 14 20:25:16 EET 2020
ffmpeg | branch: master | Limin Wang <lance.lmwang at gmail.com> | Mon Jan 13 21:44:49 2020 +0800| [44a80897e86f3a8d576e8d5a14df218be767aeab] | committer: Michael Niedermayer
avutil/avstring: Fix warning: ISO C90 forbids mixed declarations and code
Signed-off-by: Limin Wang <lance.lmwang at gmail.com>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=44a80897e86f3a8d576e8d5a14df218be767aeab
---
libavutil/avstring.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/libavutil/avstring.c b/libavutil/avstring.c
index 76a13ba3b5..f4b8ed2b45 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
More information about the ffmpeg-cvslog
mailing list