[MPlayer-cvslog] CVS: main/libmpcodecs vf_fspp.c, 1.15, 1.16 vf_qp.c, 1.7, 1.8 vf_spp.c, 1.35, 1.36 vf_uspp.c, 1.7, 1.8

[Nico Sabbi CVS]

CVS change done by Nico Sabbi CVS

Update of /cvsroot/mplayer/main/libmpcodecs
In directory mail:/var2/tmp/cvs-serv13099

Modified Files:
	vf_fspp.c vf_qp.c vf_spp.c vf_uspp.c 
Log Message:
removed unreachable code: this filter can't compile with external libavcodec (the Makefile rules prevent it)

Index: vf_fspp.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_fspp.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- vf_fspp.c	15 Apr 2006 20:46:54 -0000	1.15
+++ vf_fspp.c	17 Apr 2006 20:20:28 -0000	1.16
@@ -42,13 +42,8 @@
 #include "mp_msg.h"
 #include "cpudetect.h"
 
-#ifdef USE_LIBAVCODEC_SO
-#include <ffmpeg/avcodec.h>
-#include <ffmpeg/dsputil.h>
-#else
 #include "libavcodec/avcodec.h"
 #include "libavcodec/dsputil.h"
-#endif
 
 #ifdef HAVE_MALLOC_H
 #include <malloc.h>

Index: vf_qp.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_qp.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- vf_qp.c	21 Mar 2006 21:26:41 -0000	1.7
+++ vf_qp.c	17 Apr 2006 20:20:28 -0000	1.8
@@ -37,15 +37,9 @@
 // Needed to bring in lrintf.
 #define HAVE_AV_CONFIG_H
 
-#ifdef USE_LIBAVCODEC_SO
-#include <ffmpeg/avcodec.h>
-#include <ffmpeg/dsputil.h>
-#include <ffmpeg/common.h>
-#else
 #include "libavcodec/avcodec.h"
 #include "libavcodec/dsputil.h"
 #include "libavutil/common.h"
-#endif
 
 /* FIXME: common.h defines printf away when HAVE_AV_CONFIG
  * is defined, but mp_image.h needs printf.

Index: vf_spp.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_spp.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- vf_spp.c	21 Mar 2006 21:26:42 -0000	1.35
+++ vf_spp.c	17 Apr 2006 20:20:28 -0000	1.36
@@ -35,13 +35,8 @@
 #include "mp_msg.h"
 #include "cpudetect.h"
 
-#ifdef USE_LIBAVCODEC_SO
-#include <ffmpeg/avcodec.h>
-#include <ffmpeg/dsputil.h>
-#else
 #include "libavcodec/avcodec.h"
 #include "libavcodec/dsputil.h"
-#endif
 
 #ifdef HAVE_MALLOC_H
 #include <malloc.h>

Index: vf_uspp.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_uspp.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- vf_uspp.c	21 Mar 2006 21:26:42 -0000	1.7
+++ vf_uspp.c	17 Apr 2006 20:20:28 -0000	1.8
@@ -27,13 +27,8 @@
 #include "mp_msg.h"
 #include "cpudetect.h"
 
-#ifdef USE_LIBAVCODEC_SO
-#include <ffmpeg/avcodec.h>
-#include <ffmpeg/dsputil.h>
-#else
 #include "libavcodec/avcodec.h"
 #include "libavcodec/dsputil.h"
-#endif
 
 #ifdef HAVE_MALLOC_H
 #include <malloc.h>