From 7bdecc1be1e58302ae5c51fd2ffc869a44764a02 Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Tue, 23 Jun 2015 16:23:14 +0200
Subject: [PATCH] submodules: update VP8 to v1.4.0 and remove decoding error
 patch which is not needed anymore

---
 submodules/build/builders.d/libvpx.mk    |  9 ++-------
 submodules/build/builders.d/libvpx.patch | 19 -------------------
 submodules/externals/libvpx              |  2 +-
 3 files changed, 3 insertions(+), 27 deletions(-)
 delete mode 100644 submodules/build/builders.d/libvpx.patch

diff --git a/submodules/build/builders.d/libvpx.mk b/submodules/build/builders.d/libvpx.mk
index 800844397..e25fa8346 100644
--- a/submodules/build/builders.d/libvpx.mk
+++ b/submodules/build/builders.d/libvpx.mk
@@ -56,13 +56,8 @@ take_binary=
 libvpx_configure_options+= --extra-cflags="-fno-strict-aliasing"
 endif
 
-$(BUILDER_SRC_DIR)/$(libvpx_dir)/patched.stamp:
-	cd $(BUILDER_SRC_DIR)/$(libvpx_dir) \
-	&& git apply $(BUILDER_SRC_DIR)/build/builders.d/libvpx.patch \
-	&& touch $@
 
-
-$(BUILDER_BUILD_DIR)/$(libvpx_dir)/config.mk: $(BUILDER_SRC_DIR)/$(libvpx_dir)/patched.stamp
+$(BUILDER_BUILD_DIR)/$(libvpx_dir)/config.mk:
 	mkdir -p $(BUILDER_BUILD_DIR)/$(libvpx_dir)
 	cd $(BUILDER_BUILD_DIR)/$(libvpx_dir)/ \
 	&&  host_alias=${host} . $(BUILDER_SRC_DIR)/build/$(config_site) \
@@ -87,7 +82,7 @@ clean-libvpx:
 veryclean-libvpx:
 	-cd $(BUILDER_BUILD_DIR)/$(libvpx_dir) && make distclean
 	cd $(BUILDER_SRC_DIR)/$(libvpx_dir) \
-	&& git clean -f && git reset --hard && rm -f patched.stamp
+	&& git clean -f && git reset --hard
 	rm -rf $(BUILDER_BUILD_DIR)/$(libvpx_dir)
 
 clean-makefile-libvpx:
diff --git a/submodules/build/builders.d/libvpx.patch b/submodules/build/builders.d/libvpx.patch
deleted file mode 100644
index a0bb55045..000000000
--- a/submodules/build/builders.d/libvpx.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/vp8/vp8_dx_iface.c b/vp8/vp8_dx_iface.c
-index 5aa274d..9eee377 100644
---- a/vp8/vp8_dx_iface.c
-+++ b/vp8/vp8_dx_iface.c
-@@ -327,14 +327,6 @@ static vpx_codec_err_t vp8_decode(vpx_codec_alg_priv_t  *ctx,
-     unsigned int resolution_change = 0;
-     unsigned int w, h;
- 
--    if (data == NULL && data_sz == 0) {
--      ctx->flushed = 1;
--      return VPX_CODEC_OK;
--    }
--
--    /* Reset flushed when receiving a valid frame */
--    ctx->flushed = 0;
--
-     /* Update the input fragment data */
-     if(update_fragments(ctx, data, data_sz, &res) <= 0)
-         return res;
diff --git a/submodules/externals/libvpx b/submodules/externals/libvpx
index 7621a19aa..c74bf6d88 160000
--- a/submodules/externals/libvpx
+++ b/submodules/externals/libvpx
@@ -1 +1 @@
-Subproject commit 7621a19aa53c7b26b4bf4ba30f2c7f65f8503f9d
+Subproject commit c74bf6d889992c3cabe017ec353ca85c323107cd