summaryrefslogtreecommitdiff
path: root/libavcodec/Makefile
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2005-03-09 03:04:56 +0000
committerMichael Niedermayer <michaelni@gmx.at>2005-03-09 03:04:56 +0000
commit6662ec29a5133bf4b81e0a1edf369b97cb6734ba (patch)
tree6bef140c64cb48fc3476fa32e23059cf57d5534e /libavcodec/Makefile
parent0044a8f80df366643bcfaf74011e41a2658c88f8 (diff)
H.264 encoding with x264 by (Måns Rullgård <mru inprovide com>)
Originally committed as revision 4024 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/Makefile')
-rw-r--r--libavcodec/Makefile5
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 9c96bf8824..4b790c4cce 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -105,6 +105,11 @@ OBJS+= xvidff.o
EXTRALIBS += -lxvidcore
endif
+ifeq ($(CONFIG_X264),yes)
+OBJS+= x264.o
+EXTRALIBS += -L$(X264_DIR) -lx264
+endif
+
ifeq ($(CONFIG_PP),yes)
ifeq ($(SHARED_PP),yes)
EXTRALIBS += -L$(VPATH)/libpostproc -lpostproc