From 7c22d0489fa4bf0e74ae45725007dcba5028cb04 Mon Sep 17 00:00:00 2001
From: Diego Biurrun <diego@biurrun.de>
Date: Fri, 1 Mar 2013 19:52:32 +0100
Subject: [PATCH 1/2] build: Move setting of SRC_DIR to the only place it is
 used

---
 common.mak  | 1 +
 library.mak | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/common.mak b/common.mak
index b134835187..d3c6b9f694 100644
--- a/common.mak
+++ b/common.mak
@@ -27,6 +27,7 @@ HEADERS   += $(HEADERS-yes)
 
 DEP_LIBS := $(foreach NAME,$(FFLIBS),lib$(NAME)/$($(CONFIG_SHARED:yes=S)LIBNAME))
 
+SRC_DIR    := $(SRC_PATH)/lib$(NAME)
 ALLHEADERS := $(subst $(SRC_DIR)/,$(SUBDIR),$(wildcard $(SRC_DIR)/*.h $(SRC_DIR)/$(ARCH)/*.h))
 SKIPHEADERS += $(ARCH_HEADERS:%=$(ARCH)/%) $(SKIPHEADERS-)
 SKIPHEADERS := $(SKIPHEADERS:%=$(SUBDIR)%)
diff --git a/library.mak b/library.mak
index f3e44273f7..88d33dccfc 100644
--- a/library.mak
+++ b/library.mak
@@ -1,5 +1,3 @@
-SRC_DIR := $(SRC_PATH)/lib$(NAME)
-
 include $(SRC_PATH)/common.mak
 
 LIBVERSION := $(lib$(NAME)_VERSION)

From 472391b9a7e15e3bff33b016e7b6dbfa6a555975 Mon Sep 17 00:00:00 2001
From: Kostya Shishkov <kostya.shishkov@gmail.com>
Date: Wed, 27 Mar 2013 08:57:08 +0100
Subject: [PATCH 2/2] ape: use correct context for the bit table printed in
 debug

---
 libavformat/ape.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/ape.c b/libavformat/ape.c
index e70fcfd017..c4ce6acf80 100644
--- a/libavformat/ape.c
+++ b/libavformat/ape.c
@@ -134,7 +134,7 @@ static void ape_dumpinfo(AVFormatContext * s, APEContext * ape_ctx)
                 av_log(s, AV_LOG_DEBUG, "%8d   %"PRIu32" (%"PRIu32" bytes)",
                        i, ape_ctx->seektable[i],
                        ape_ctx->seektable[i + 1] - ape_ctx->seektable[i]);
-                if (s->bittable)
+                if (ape_ctx->bittable)
                     av_log(s, AV_LOG_DEBUG, " + %2d bits\n",
                            ape_ctx->bittable[i]);
                 av_log(s, AV_LOG_DEBUG, "\n");