diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2003-02-14 21:27:25 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2003-02-14 21:27:25 +0000 |
| commit | bba9b16c265f7a0ce3a1bc5dbf88d178ebec457a (patch) | |
| tree | 16024959c1ac83c766f7dd0cf556a5ecaf6c4a19 /libavcodec/Makefile | |
| parent | 7d67e968a4ec375257c21e4658d91452aeba9a74 (diff) | |
| download | ffmpeg-bba9b16c265f7a0ce3a1bc5dbf88d178ebec457a.tar.gz | |
moving postprocess to ffmpeg/libavcodec
Originally committed as revision 1586 to svn://svn.ffmpeg.org/ffmpeg/trunk
Originally committed as revision 9427 to svn://svn.mplayerhq.hu/mplayer/trunk/postproc
Originally committed as revision 9428 to svn://svn.mplayerhq.hu/mplayer/trunk/postproc
Diffstat (limited to 'libavcodec/Makefile')
| -rw-r--r-- | libavcodec/Makefile | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index f8be2a83fa..62454621b8 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -35,6 +35,15 @@ OBJS+= liba52/bit_allocate.o liba52/bitstream.o liba52/downmix.o \ endif endif +ifeq ($(CONFIG_PP),yes) +ifeq ($(SHARED_PP),yes) +EXTRALIBS += -lpostproc +else +# LIBS += libpostproc/libpostproc.a ... should be fixed +OBJS += libpostproc/postprocess.o +endif +endif + ifeq ($(CONFIG_MP3LAME),yes) OBJS += mp3lameaudio.o EXTRALIBS += -lmp3lame @@ -125,6 +134,9 @@ $(SLIB): $(OBJS) dsputil.o: dsputil.c dsputil.h +libpostproc/libpostproc.a: + $(MAKE) -C libpostproc + %.o: %.c $(CC) $(CFLAGS) -c -o $@ $< |