From 42bbb763fd93ee3936ea50e003c0892c791b1214 Mon Sep 17 00:00:00 2001 From: Johns Date: Thu, 27 Feb 2014 14:20:25 +0100 Subject: Fix compile with newer libav. --- Makefile | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 7dfe3cb..cf76c0e 100644 --- a/Makefile +++ b/Makefile @@ -25,6 +25,10 @@ VDPAU ?= $(shell pkg-config --exists vdpau && echo 1) SCREENSAVER ?= 1 # use ffmpeg libswresample SWRESAMPLE ?= $(shell pkg-config --exists libswresample && echo 1) + # use libav libavresample +ifneq ($(SWRESAMPLE),1) +AVRESAMPLE ?= $(shell pkg-config --exists libavresample && echo 1) +endif CONFIG := # -DDEBUG #-DOSD_DEBUG # enable debug output+functions #CONFIG += -DSTILL_DEBUG=2 # still picture debug verbose level @@ -78,6 +82,11 @@ CONFIG += -DUSE_SWRESAMPLE _CFLAGS += $(shell pkg-config --cflags libswresample) LIBS += $(shell pkg-config --libs libswresample) endif +ifeq ($(AVRESAMPLE),1) +CONFIG += -DUSE_AVRESAMPLE +_CFLAGS += $(shell pkg-config --cflags libavresample) +LIBS += $(shell pkg-config --libs libavresample) +endif _CFLAGS += $(shell pkg-config --cflags libavcodec x11 x11-xcb xcb xcb-icccm) LIBS += -lrt $(shell pkg-config --libs libavcodec x11 x11-xcb xcb xcb-icccm) -- cgit v1.2.3