Mercurial > mplayer.hg
changeset 18131:e83548b7bd3b
removed unreachable code: this filter can't compile with external libavcodec (the Makefile rules prevent it)
author | nicodvb |
---|---|
date | Mon, 17 Apr 2006 20:20:28 +0000 |
parents | eadedbf1fc49 |
children | f6d9baeec832 |
files | libmpcodecs/vf_fspp.c libmpcodecs/vf_qp.c libmpcodecs/vf_spp.c libmpcodecs/vf_uspp.c |
diffstat | 4 files changed, 0 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- a/libmpcodecs/vf_fspp.c Mon Apr 17 17:50:34 2006 +0000 +++ b/libmpcodecs/vf_fspp.c Mon Apr 17 20:20:28 2006 +0000 @@ -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>
--- a/libmpcodecs/vf_qp.c Mon Apr 17 17:50:34 2006 +0000 +++ b/libmpcodecs/vf_qp.c Mon Apr 17 20:20:28 2006 +0000 @@ -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.
--- a/libmpcodecs/vf_spp.c Mon Apr 17 17:50:34 2006 +0000 +++ b/libmpcodecs/vf_spp.c Mon Apr 17 20:20:28 2006 +0000 @@ -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>
--- a/libmpcodecs/vf_uspp.c Mon Apr 17 17:50:34 2006 +0000 +++ b/libmpcodecs/vf_uspp.c Mon Apr 17 20:20:28 2006 +0000 @@ -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>