mirror of https://github.com/mpv-player/mpv
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
This commit is contained in:
parent
508cbe9be6
commit
e23ef70156
|
@ -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>
|
||||
|
|
|
@ -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.
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
|
Loading…
Reference in New Issue