mirror of https://github.com/mpv-player/mpv
libavutil compile fix (working also with old libavcodec)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16169 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
e5b52ff472
commit
19760a4dca
|
@ -28,9 +28,17 @@ SRCS=af.c \
|
||||||
window.c \
|
window.c \
|
||||||
$(OPTIONAL_SRCS) \
|
$(OPTIONAL_SRCS) \
|
||||||
|
|
||||||
|
LIBAV_INC =
|
||||||
|
ifeq ($(CONFIG_LIBAVUTIL),yes)
|
||||||
|
LIBAV_INC += -I../libavutil
|
||||||
|
endif
|
||||||
|
ifeq ($(CONFIG_LIBAVCODEC),yes)
|
||||||
|
LIBAV_INC += -I../libavcodec
|
||||||
|
endif
|
||||||
|
|
||||||
OBJS=$(SRCS:.c=.o)
|
OBJS=$(SRCS:.c=.o)
|
||||||
|
|
||||||
CFLAGS = $(OPTFLAGS) -I. -Wall $(EXTRA_INC) -D_GNU_SOURCE
|
CFLAGS = $(OPTFLAGS) -I. -Wall $(LIBAV_INC) $(EXTRA_INC) -D_GNU_SOURCE
|
||||||
|
|
||||||
ifeq ($(TARGET_OS),MINGW32)
|
ifeq ($(TARGET_OS),MINGW32)
|
||||||
CFLAGS += -D_IO_H_
|
CFLAGS += -D_IO_H_
|
||||||
|
|
|
@ -15,8 +15,8 @@
|
||||||
#include <ffmpeg/avcodec.h>
|
#include <ffmpeg/avcodec.h>
|
||||||
#include <ffmpeg/rational.h>
|
#include <ffmpeg/rational.h>
|
||||||
#else
|
#else
|
||||||
#include "../libavcodec/avcodec.h"
|
#include "avcodec.h"
|
||||||
#include "../libavutil/rational.h"
|
#include "rational.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define CHANS 6
|
#define CHANS 6
|
||||||
|
|
Loading…
Reference in New Issue