generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

vp9_pickmode.c: check value that can be null to avoid warning

Browse Source 
Change-Id: Ia023a49ddb606899171ff19f9e271ec8ed0b2fb3
This commit is contained in:
Jim Bankoski 2014-08-18 15:41:58 -07:00 committed by Gerrit Code Review
parent 76e9992b9b
commit 8f4b357d99
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
vp9/encoder/vp9_pickmode.c
View File

@ -253,7 +253,8 @@ static int get_pred_buffer(PRED_BUFFER *p, int len) {
} }
static void free_pred_buffer(PRED_BUFFER *p) { static void free_pred_buffer(PRED_BUFFER *p) {
p->in_use = 0; if (p != NULL)
p->in_use = 0;
} }
static void encode_breakout_test(VP9_COMP *cpi, MACROBLOCK *x, static void encode_breakout_test(VP9_COMP *cpi, MACROBLOCK *x,
@ -625,8 +626,7 @@ int64_t vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
skip_txfm = x->skip_txfm[0]; skip_txfm = x->skip_txfm[0];
if (cpi->sf.reuse_inter_pred_sby) { if (cpi->sf.reuse_inter_pred_sby) {
if (best_pred != NULL) free_pred_buffer(best_pred);
free_pred_buffer(best_pred);
best_pred = this_mode_pred; best_pred = this_mode_pred;
} }
@ -646,7 +646,8 @@ int64_t vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
// If best prediction is not in dst buf, then copy the prediction block from // If best prediction is not in dst buf, then copy the prediction block from
// temp buf to dst buf. // temp buf to dst buf.
if (cpi->sf.reuse_inter_pred_sby && best_pred->data != orig_dst.buf) { if (best_pred != NULL && cpi->sf.reuse_inter_pred_sby &&
best_pred->data != orig_dst.buf) {
uint8_t *copy_from, *copy_to; uint8_t *copy_from, *copy_to;
pd->dst = orig_dst; pd->dst = orig_dst;