diff options
| author | rogerdpack <rogerpack2005@gmail.com> | 2012-10-10 17:28:55 -0600 |
|---|---|---|
| committer | Stefano Sabatini <stefasab@gmail.com> | 2012-10-29 18:50:48 +0100 |
| commit | c1804dc4ce164fc3993ca93a5c9649d73fb485b4 (patch) | |
| tree | e30599276876bcf843676493987a41bf66247f11 /libavfilter | |
| parent | 7691860c7374a6cbe56a375586df112d05278997 (diff) | |
| download | ffmpeg-c1804dc4ce164fc3993ca93a5c9649d73fb485b4.tar.gz | |
lavfi/frei0r: allow for Windows style paths
Update path handling against the latest Frei0r specification changes.
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/version.h | 2 | ||||
| -rw-r--r-- | libavfilter/vf_frei0r.c | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/libavfilter/version.h b/libavfilter/version.h index e6c10e5a65..ff381079c5 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 643fb88f73..9928113644 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); |