lavfi: remove swapuv libmpcodecs wrapper

The filter has been ported to a native libavfilter filter.

5 files changed, 1 insertions, 111 deletions

diff --git a/doc/filters.texi b/doc/filters.texi
index b32de63dd7..b13d5f5cbd 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -1851,7 +1851,6 @@ The list of the currently supported filters follows:
 @item softpulldown
 @item softskip
 @item spp
-@item swapuv
 @item telecine
 @item tile
 @item tinterlace
diff --git a/libavfilter/Makefile b/libavfilter/Makefile
index 3bdb189a5c..e9c9a4b8a4 100644
--- a/libavfilter/Makefile
+++ b/libavfilter/Makefile
@@ -156,7 +156,6 @@ OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_softpulldown.o
 OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_softskip.o
 OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_spp.o
 OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_stereo3d.o
-OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_swapuv.o
 OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_telecine.o
 OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_tile.o
 OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_tinterlace.o
diff --git a/libavfilter/libmpcodecs/vf_swapuv.c b/libavfilter/libmpcodecs/vf_swapuv.c
deleted file mode 100644
index 4d0e8fcb16..0000000000
--- a/libavfilter/libmpcodecs/vf_swapuv.c
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright (C) 2002 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of MPlayer.
- *
- * MPlayer is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * MPlayer is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with MPlayer; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <inttypes.h>
-#include <assert.h>
-
-#include "mp_msg.h"
-#include "img_format.h"
-#include "mp_image.h"
-#include "vf.h"
-
-
-//===========================================================================//
-
-static void get_image(struct vf_instance *vf, mp_image_t *mpi){
-    mp_image_t *dmpi= vf_get_image(vf->next, mpi->imgfmt,
-        mpi->type, mpi->flags, mpi->w, mpi->h);
-
-    mpi->planes[0]=dmpi->planes[0];
-    mpi->planes[1]=dmpi->planes[2];
-    mpi->planes[2]=dmpi->planes[1];
-    mpi->stride[0]=dmpi->stride[0];
-    mpi->stride[1]=dmpi->stride[2];
-    mpi->stride[2]=dmpi->stride[1];
-    mpi->width=dmpi->width;
-
-    mpi->flags|=MP_IMGFLAG_DIRECT;
-    mpi->priv=(void*)dmpi;
-}
-
-static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){
-    mp_image_t *dmpi;
-
-    if(mpi->flags&MP_IMGFLAG_DIRECT){
-        dmpi=(mp_image_t*)mpi->priv;
-    } else {
-        dmpi=vf_get_image(vf->next, mpi->imgfmt, MP_IMGTYPE_EXPORT, 0, mpi->w, mpi->h);
-        assert(mpi->flags&MP_IMGFLAG_PLANAR);
-        dmpi->planes[0]=mpi->planes[0];
-        dmpi->planes[1]=mpi->planes[2];
-        dmpi->planes[2]=mpi->planes[1];
-        dmpi->stride[0]=mpi->stride[0];
-        dmpi->stride[1]=mpi->stride[2];
-        dmpi->stride[2]=mpi->stride[1];
-        dmpi->width=mpi->width;
-    }
-
-    vf_clone_mpi_attributes(dmpi, mpi);
-
-    return vf_next_put_image(vf,dmpi, pts);
-}
-
-//===========================================================================//
-
-static int query_format(struct vf_instance *vf, unsigned int fmt){
-        switch(fmt)
-        {
-        case IMGFMT_YV12:
-        case IMGFMT_I420:
-        case IMGFMT_IYUV:
-        case IMGFMT_YVU9:
-        case IMGFMT_444P:
-        case IMGFMT_422P:
-        case IMGFMT_411P:
-                return vf_next_query_format(vf, fmt);
-        }
-        return 0;
-}
-
-static int vf_open(vf_instance_t *vf, char *args){
-    vf->put_image=put_image;
-    vf->get_image=get_image;
-    vf->query_format=query_format;
-    return 1;
-}
-
-const vf_info_t vf_info_swapuv = {
-    "UV swapper",
-    "swapuv",
-    "Michael Niedermayer",
-    "",
-    vf_open,
-    NULL
-};
-
-//===========================================================================//
diff --git a/libavfilter/version.h b/libavfilter/version.h
index a599e1c5a4..fcced1d0d3 100644
--- a/libavfilter/version.h
+++ b/libavfilter/version.h
@@ -30,7 +30,7 @@
 
 #define LIBAVFILTER_VERSION_MAJOR  2
 #define LIBAVFILTER_VERSION_MINOR 64
-#define LIBAVFILTER_VERSION_MICRO 100
+#define LIBAVFILTER_VERSION_MICRO 101
 
 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
                                                LIBAVFILTER_VERSION_MINOR, \
diff --git a/libavfilter/vf_mp.c b/libavfilter/vf_mp.c
index 75a4246b9e..6d548743fe 100644
--- a/libavfilter/vf_mp.c
+++ b/libavfilter/vf_mp.c
@@ -178,7 +178,6 @@ extern const vf_info_t vf_info_softpulldown;
 extern const vf_info_t vf_info_softskip;
 extern const vf_info_t vf_info_spp;
 extern const vf_info_t vf_info_stereo3d;
-extern const vf_info_t vf_info_swapuv;
 extern const vf_info_t vf_info_telecine;
 extern const vf_info_t vf_info_test;
 extern const vf_info_t vf_info_tfields;
@@ -239,7 +238,6 @@ static const vf_info_t* const filters[]={
     &vf_info_softskip,
     &vf_info_spp,
     &vf_info_stereo3d,
-    &vf_info_swapuv,
     &vf_info_telecine,
     &vf_info_tile,
     &vf_info_tinterlace,