[FFmpeg-cvslog] lavfi/frei0r: allow for Windows style paths

[rogerdpack]

ffmpeg | branch: master | rogerdpack <rogerpack2005 at gmail.com> | Wed Oct 10 17:28:55 2012 -0600| [c1804dc4ce164fc3993ca93a5c9649d73fb485b4] | committer: Stefano Sabatini

lavfi/frei0r: allow for Windows style paths

Update path handling against the latest Frei0r specification changes.

Signed-off-by: rogerdpack <rogerpack2005 at gmail.com>
Signed-off-by: Stefano Sabatini <stefasab at gmail.com>

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

 doc/filters.texi        |    9 +++++----
 libavfilter/version.h   |    2 +-
 libavfilter/vf_frei0r.c |    7 ++++++-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/doc/filters.texi b/doc/filters.texi
index b9ad187..0e77914 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -2213,10 +2213,11 @@ The filter supports the syntax:
 
 @var{filter_name} is the name to the frei0r effect to load. If the
 environment variable @env{FREI0R_PATH} is defined, the frei0r effect
-is searched in each one of the directories specified by the colon
-separated list in @env{FREIOR_PATH}, otherwise in the standard frei0r
-paths, which are in this order: @file{HOME/.frei0r-1/lib/},
- at file{/usr/local/lib/frei0r-1/}, @file{/usr/lib/frei0r-1/}.
+is searched in each one of the directories specified by the colon (or
+semicolon on Windows platforms) separated list in @env{FREIOR_PATH},
+otherwise in the standard frei0r paths, which are in this order:
+ at file{HOME/.frei0r-1/lib/}, @file{/usr/local/lib/frei0r-1/},
+ at file{/usr/lib/frei0r-1/}.
 
 @var{param1}, @var{param2}, ... , @var{paramN} specify the parameters
 for the frei0r effect.
diff --git a/libavfilter/version.h b/libavfilter/version.h
index e6c10e5..ff38107 100644
--- a/libavfilter/version.h
+++ b/libavfilter/version.h
@@ -30,7 +30,7 @@
 
 #define LIBAVFILTER_VERSION_MAJOR  3
 #define LIBAVFILTER_VERSION_MINOR  20
-#define LIBAVFILTER_VERSION_MICRO 108
+#define LIBAVFILTER_VERSION_MICRO 109
 
 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
                                                LIBAVFILTER_VERSION_MINOR, \
diff --git a/libavfilter/vf_frei0r.c b/libavfilter/vf_frei0r.c
index 643fb88..9928113 100644
--- a/libavfilter/vf_frei0r.c
+++ b/libavfilter/vf_frei0r.c
@@ -224,8 +224,13 @@ static av_cold int frei0r_init(AVFilterContext *ctx,
 
     /* see: http://frei0r.dyne.org/codedoc/html/group__pluglocations.html */
     if ((path = av_strdup(getenv("FREI0R_PATH")))) {
+#ifdef _WIN32
+        const char *separator = ";";
+#else
+        const char *separator = ":";
+#endif
         char *p, *ptr = NULL;
-        for (p = path; p = av_strtok(p, ":", &ptr); p = NULL)
+        for (p = path; p = av_strtok(p, separator, &ptr); p = NULL)
             if (frei0r->dl_handle = load_path(ctx, p, dl_name))
                 break;
         av_free(path);