1. ffmpeg
  2. Commit dac1d92cb75733e3eb1431eac4867449e06b6c7a
Browse code

Merge commit '472391b9a7e15e3bff33b016e7b6dbfa6a555975'

* commit '472391b9a7e15e3bff33b016e7b6dbfa6a555975':
ape: use correct context for the bit table printed in debug
build: Move setting of SRC_DIR to the only place it is used

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Michael Niedermayer authored on 2013/03/28 20:12:31
Showing 2 changed files
common.mak
History View file @ dac1d92
... ... 
@@ -101,6 +101,7 @@ HEADERS   += $(HEADERS-yes)
101 101
102 102 
 DEP_LIBS := $(foreach NAME,$(FFLIBS),lib$(NAME)/$($(CONFIG_SHARED:yes=S)LIBNAME))
103 103
104 
+SRC_DIR    := $(SRC_PATH)/lib$(NAME)
104 105 
 ALLHEADERS := $(subst $(SRC_DIR)/,$(SUBDIR),$(wildcard $(SRC_DIR)/*.h $(SRC_DIR)/$(ARCH)/*.h))
105 106 
 SKIPHEADERS += $(ARCH_HEADERS:%=$(ARCH)/%) $(SKIPHEADERS-)
106 107 
 SKIPHEADERS := $(SKIPHEADERS:%=$(SUBDIR)%)
library.mak
History View file @ dac1d92
... ... 
@@ -1,5 +1,3 @@
1 
-SRC_DIR := $(SRC_PATH)/lib$(NAME)
2 
-
3 1 
 include $(SRC_PATH)/common.mak
4 2
5 3 
 LIBVERSION := $(lib$(NAME)_VERSION)