diff options
| author | al <al@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-08-01 20:16:56 +0000 |
|---|---|---|
| committer | al <al@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-08-01 20:16:56 +0000 |
| commit | bd342e463af94e4e748fc6f096b6ebb275685932 (patch) | |
| tree | 05a0a74a063fe3cde419cde64c87a931de74e21d /libmpcodecs | |
| parent | 2d14fdcb3a53f7775543f8ef85cae5edf41d3637 (diff) | |
| download | mpv-bd342e463af94e4e748fc6f096b6ebb275685932.tar.bz2 mpv-bd342e463af94e4e748fc6f096b6ebb275685932.tar.xz | |
Support new static libavcodec (depends on libavutil).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16166 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/Makefile | 7 | ||||
| -rw-r--r-- | libmpcodecs/ad_ffmpeg.c | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/libmpcodecs/Makefile b/libmpcodecs/Makefile index e2867f312e..909aef1907 100644 --- a/libmpcodecs/Makefile +++ b/libmpcodecs/Makefile @@ -183,7 +183,12 @@ ifeq ($(CONFIG_MP3LAME),yes) ENCODER_SRCS += ae_lame.c endif +LIBAV_INC = +ifeq ($(CONFIG_LIBAVUTIL),yes) +LIBAV_INC += -I../libavutil +endif ifeq ($(CONFIG_LIBAVCODEC),yes) +LIBAV_INC += -I../libavcodec ENCODER_SRCS += ae_lavc.c endif @@ -201,7 +206,7 @@ OBJS=$(SRCS:.c=.o) SRCS2=$(ENCODER_SRCS) OBJS2=$(SRCS2:.c=.o) -CFLAGS = $(OPTFLAGS) -I. -Inative -I.. -I../libmpdemux -I../loader $(EXTRA_INC) $(X264_INC) -D_GNU_SOURCE +CFLAGS = $(OPTFLAGS) -I. -Inative -I.. -I../libmpdemux -I../loader $(LIBAV_INC) $(EXTRA_INC) $(X264_INC) -D_GNU_SOURCE .SUFFIXES: .c .o diff --git a/libmpcodecs/ad_ffmpeg.c b/libmpcodecs/ad_ffmpeg.c index 4d6de38fcd..d1132d43f1 100644 --- a/libmpcodecs/ad_ffmpeg.c +++ b/libmpcodecs/ad_ffmpeg.c @@ -28,7 +28,7 @@ LIBAD_EXTERN(ffmpeg) #ifdef USE_LIBAVCODEC_SO #include <ffmpeg/avcodec.h> #else -#include "libavcodec/avcodec.h" +#include "avcodec.h" #endif extern int avcodec_inited; |