summaryrefslogtreecommitdiffstats
path: root/libmpcodecs
diff options
context:
space:
mode:
authornicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-04-17 20:20:28 +0000
committernicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-04-17 20:20:28 +0000
commite23ef7015620e809c35e7362197d0ef8e17c410a (patch)
treee783bdf01243727a34b6c481b9e62227fc02b7a1 /libmpcodecs
parent508cbe9be6c31b5dc491e2c2bbab1a1e40bbee7a (diff)
downloadmpv-e23ef7015620e809c35e7362197d0ef8e17c410a.tar.bz2
mpv-e23ef7015620e809c35e7362197d0ef8e17c410a.tar.xz
removed unreachable code: this filter can't compile with external libavcodec (the Makefile rules prevent it)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18132 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
-rw-r--r--libmpcodecs/vf_fspp.c5
-rw-r--r--libmpcodecs/vf_qp.c6
-rw-r--r--libmpcodecs/vf_spp.c5
-rw-r--r--libmpcodecs/vf_uspp.c5
4 files changed, 0 insertions, 21 deletions
diff --git a/libmpcodecs/vf_fspp.c b/libmpcodecs/vf_fspp.c
index 006fcb0d47..fc475630a2 100644
--- a/libmpcodecs/vf_fspp.c
+++ b/libmpcodecs/vf_fspp.c
@@ -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>
diff --git a/libmpcodecs/vf_qp.c b/libmpcodecs/vf_qp.c
index e9355bf0ae..ec101c7933 100644
--- a/libmpcodecs/vf_qp.c
+++ b/libmpcodecs/vf_qp.c
@@ -37,15 +37,9 @@ double ff_eval(char *s, double *const_value, const char **const_name,
// 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.
diff --git a/libmpcodecs/vf_spp.c b/libmpcodecs/vf_spp.c
index d58bbdd2aa..b70b29ecd4 100644
--- a/libmpcodecs/vf_spp.c
+++ b/libmpcodecs/vf_spp.c
@@ -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>
diff --git a/libmpcodecs/vf_uspp.c b/libmpcodecs/vf_uspp.c
index 21ad5d821d..14ae9592a0 100644
--- a/libmpcodecs/vf_uspp.c
+++ b/libmpcodecs/vf_uspp.c
@@ -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>