Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 10:44:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1237848 - Updated update.py patch - r=rillian

Browse Source
This commit is contained in:
Gerald Squelart 2016-02-04 11:29:02 +11:00
parent 422f564ea3
commit 79f040d43b
2 changed files with 52 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
media/libvpx/1237848-check-lookahead-ctx.patch Normal file
View File

@ -0,0 +1,50 @@
# HG changeset patch
# User Gerald Squelart <gsquelart@mozilla.com>
# Parent 5f9ba76eb3b1fd9377bbdb4cc2f98a7e75eabdfb
Bug 1237848 - Check lookahead ctx - r=rillian
Copied from https://chromium-review.googlesource.com/324510
diff --git a/media/libvpx/vp8/encoder/lookahead.c b/media/libvpx/vp8/encoder/lookahead.c
--- a/media/libvpx/vp8/encoder/lookahead.c
+++ b/media/libvpx/vp8/encoder/lookahead.c
@@ -176,16 +176,17 @@ vp8_lookahead_push(struct lookahead_ctx
struct lookahead_entry*
vp8_lookahead_pop(struct lookahead_ctx *ctx,
int drain)
{
struct lookahead_entry* buf = NULL;
+ assert(ctx != NULL);
if(ctx->sz && (drain || ctx->sz == ctx->max_sz - 1))
{
buf = pop(ctx, &ctx->read_idx);
ctx->sz--;
}
return buf;
}
diff --git a/media/libvpx/vp9/encoder/vp9_lookahead.c b/media/libvpx/vp9/encoder/vp9_lookahead.c
--- a/media/libvpx/vp9/encoder/vp9_lookahead.c
+++ b/media/libvpx/vp9/encoder/vp9_lookahead.c
@@ -202,17 +202,17 @@ int vp9_lookahead_push(struct lookahead_
return 0;
}
struct lookahead_entry *vp9_lookahead_pop(struct lookahead_ctx *ctx,
int drain) {
struct lookahead_entry *buf = NULL;
- if (ctx->sz && (drain || ctx->sz == ctx->max_sz - MAX_PRE_FRAMES)) {
+ if (ctx && ctx->sz && (drain || ctx->sz == ctx->max_sz - MAX_PRE_FRAMES)) {
buf = pop(ctx, &ctx->read_idx);
ctx->sz--;
}
return buf;
}
struct lookahead_entry *vp9_lookahead_peek(struct lookahead_ctx *ctx,

2
media/libvpx/update.py
View File

@ -602,6 +602,8 @@ def apply_patches():
os.system("patch -p3 < clang-cl.patch")
# Bug 1224371 - Cast uint8_t to uint32_t before shift
os.system("patch -p3 < cast-char-to-uint-before-shift.patch")
# Bug 1237848 - Check lookahead ctx
os.system("patch -p3 < 1237848-check-lookahead-ctx.patch")
def update_readme(commit):
with open('README_MOZILLA') as f: