diff options
author | wm4 <wm4@nowhere> | 2014-03-16 10:04:46 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2014-03-16 13:19:28 +0100 |
commit | 64c01a814c8f7cf4a780b89fe00ed608b1f93e2b (patch) | |
tree | 00d3a7f8b6110cdc60da2bebb99f76de46696b95 /video/filter/vf_lavfi.c | |
parent | 5506c8d0f6450133d33e940fcdeaecc25564092a (diff) | |
download | mpv-64c01a814c8f7cf4a780b89fe00ed608b1f93e2b.tar.bz2 mpv-64c01a814c8f7cf4a780b89fe00ed608b1f93e2b.tar.xz |
Remove some more unneeded version checks
All of these check against things that happened before the latest
supported FFmpeg/Libav release.
Diffstat (limited to 'video/filter/vf_lavfi.c')
-rw-r--r-- | video/filter/vf_lavfi.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/video/filter/vf_lavfi.c b/video/filter/vf_lavfi.c index 7faf5a5b96..3d22817cb2 100644 --- a/video/filter/vf_lavfi.c +++ b/video/filter/vf_lavfi.c @@ -47,11 +47,9 @@ #include "vf.h" #include "vf_lavfi.h" -#define IS_LIBAV_FORK (LIBAVFILTER_VERSION_MICRO < 100) - // FFmpeg and Libav have slightly different APIs, just enough to cause us // unnecessary pain. <Expletive deleted.> -#if IS_LIBAV_FORK +#if LIBAVFILTER_VERSION_MICRO < 100 #define graph_parse(graph, filters, inputs, outputs, log_ctx) \ avfilter_graph_parse(graph, filters, inputs, outputs, log_ctx) #else @@ -59,14 +57,6 @@ avfilter_graph_parse(graph, filters, &(inputs), &(outputs), log_ctx) #endif -// ":" is deprecated, but "|" doesn't work in earlier versions. -#if (IS_LIBAV_FORK && LIBAVFILTER_VERSION_INT >= AV_VERSION_INT(3, 7, 0)) || \ - (!IS_LIBAV_FORK && LIBAVFILTER_VERSION_INT >= AV_VERSION_INT(3, 50, 100)) -#define FMTSEP "|" -#else -#define FMTSEP ":" -#endif - struct vf_priv_s { AVFilterGraph *graph; AVFilterContext *in; @@ -159,7 +149,7 @@ static bool recreate_graph(struct vf_instance *vf, int width, int height, if (vf_next_query_format(vf, n)) { const char *name = av_get_pix_fmt_name(imgfmt2pixfmt(n)); if (name) { - const char *s = fmtstr[0] ? FMTSEP : ""; + const char *s = fmtstr[0] ? "|" : ""; fmtstr = talloc_asprintf_append_buffer(fmtstr, "%s%s", s, name); } } |