Merge svn changes up to r31176

2 files changed, 0 insertions, 103 deletions

diff --git a/libmpcodecs/vf.c b/libmpcodecs/vf.c
index 98688793e8..217e802a84 100644
--- a/libmpcodecs/vf.c
+++ b/libmpcodecs/vf.c
@@ -50,7 +50,6 @@ extern const vf_info_t vf_info_pp;
 extern const vf_info_t vf_info_scale;
 extern const vf_info_t vf_info_format;
 extern const vf_info_t vf_info_noformat;
-extern const vf_info_t vf_info_yuy2;
 extern const vf_info_t vf_info_flip;
 extern const vf_info_t vf_info_rgb2bgr;
 extern const vf_info_t vf_info_rotate;
@@ -136,9 +135,6 @@ static const vf_info_t* const filter_list[]={
     &vf_info_vo,
     &vf_info_format,
     &vf_info_noformat,
-#ifdef CONFIG_LIBSWSCALE_INTERNALS
-    &vf_info_yuy2,
-#endif
     &vf_info_flip,
 #ifdef CONFIG_LIBSWSCALE_INTERNALS
     &vf_info_rgb2bgr,
diff --git a/libmpcodecs/vf_yuy2.c b/libmpcodecs/vf_yuy2.c
deleted file mode 100644
index 987de0b1ce..0000000000
--- a/libmpcodecs/vf_yuy2.c
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * 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 "config.h"
-#include "mp_msg.h"
-
-#include "img_format.h"
-#include "mp_image.h"
-#include "vf.h"
-
-#include "libswscale/rgb2rgb.h"
-#include "vf_scale.h"
-
-//===========================================================================//
-
-static int config(struct vf_instance* vf,
-        int width, int height, int d_width, int d_height,
-	unsigned int flags, unsigned int outfmt){
-
-    sws_rgb2rgb_init(get_sws_cpuflags());
-
-    if(vf_next_query_format(vf,IMGFMT_YUY2)<=0){
-	mp_tmsg(MSGT_VFILTER, MSGL_WARN, "%s not supported by next filter/vo :(\n", "YUY2");
-	return 0;
-    }
-
-    return vf_next_config(vf,width,height,d_width,d_height,flags,IMGFMT_YUY2);
-}
-
-static int put_image(struct vf_instance* vf, mp_image_t *mpi, double pts){
-    mp_image_t *dmpi;
-
-    // hope we'll get DR buffer:
-    dmpi=vf_get_image(vf->next,IMGFMT_YUY2,
-	MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE,
-	mpi->w, mpi->h);
-
-    if(mpi->imgfmt==IMGFMT_422P)
-    yuv422ptoyuy2(mpi->planes[0],mpi->planes[1],mpi->planes[2], dmpi->planes[0],
-	    mpi->w,mpi->h, mpi->stride[0],mpi->stride[1],dmpi->stride[0]);
-    else
-    yv12toyuy2(mpi->planes[0],mpi->planes[1],mpi->planes[2], dmpi->planes[0],
-	    mpi->w,mpi->h, mpi->stride[0],mpi->stride[1],dmpi->stride[0]);
-
-    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_422P:
-	return vf_next_query_format(vf,IMGFMT_YUY2) & (~VFCAP_CSP_SUPPORTED_BY_HW);
-    }
-    return 0;
-}
-
-static int vf_open(vf_instance_t *vf, char *args){
-    vf->config=config;
-    vf->put_image=put_image;
-    vf->query_format=query_format;
-    return 1;
-}
-
-const vf_info_t vf_info_yuy2 = {
-    "fast YV12/Y422p -> YUY2 conversion",
-    "yuy2",
-    "A'rpi",
-    "",
-    vf_open,
-    NULL
-};
-
-//===========================================================================//