From 998b21b2769f60b2e20ea1c282457d7e8a79852f Mon Sep 17 00:00:00 2001 From: Guillaume BIENKOWSKI Date: Thu, 20 Nov 2014 16:28:35 +0100 Subject: [PATCH] Fix VP8 broken with avpf --- submodules/build/builders.d/libvpx.mk | 2 +- submodules/build/builders.d/libvpx.patch | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) create 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 101806bd7..b3f4d24fc 100644 --- a/submodules/build/builders.d/libvpx.mk +++ b/submodules/build/builders.d/libvpx.mk @@ -51,7 +51,7 @@ $(BUILDER_SRC_DIR)/$(libvpx_dir)/patched.stamp: && touch $@ -$(BUILDER_BUILD_DIR)/$(libvpx_dir)/config.mk: +$(BUILDER_BUILD_DIR)/$(libvpx_dir)/config.mk: $(BUILDER_SRC_DIR)/$(libvpx_dir)/patched.stamp mkdir -p $(BUILDER_BUILD_DIR)/$(libvpx_dir) cd $(BUILDER_BUILD_DIR)/$(libvpx_dir)/ \ && host_alias=${host} . $(BUILDER_SRC_DIR)/build/$(config_site) \ diff --git a/submodules/build/builders.d/libvpx.patch b/submodules/build/builders.d/libvpx.patch new file mode 100644 index 000000000..a0bb55045 --- /dev/null +++ b/submodules/build/builders.d/libvpx.patch @@ -0,0 +1,19 @@ +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;