diff options
| author | James Zern <jzern@google.com> | 2023-02-24 17:49:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-02-24 17:49:25 +0000 |
| commit | 3cf0568ace5c1648189baec16ba7da244e16370d (patch) | |
| tree | 3d70d55d2dec8561d835ce50c092832683ce28ed | |
| parent | 1614895e068a204583de7b05701d6fd0f0d42ae6 (diff) | |
| parent | 76389886ee6bf90e8fe464547eb26bb2311ae698 (diff) | |
| download | libvpx-3cf0568ace5c1648189baec16ba7da244e16370d.tar libvpx-3cf0568ace5c1648189baec16ba7da244e16370d.tar.gz libvpx-3cf0568ace5c1648189baec16ba7da244e16370d.tar.bz2 libvpx-3cf0568ace5c1648189baec16ba7da244e16370d.zip | |
Merge changes Ia64d175a,Ie4ea8f0a into main
* changes:
vp9_loop_filter_alloc: clear -Wshadow warnings
vp9_adapt_mode_probs: clear -Wshadow warning
| -rw-r--r-- | vp9/common/vp9_entropymode.c | 1 | ||||
| -rw-r--r-- | vp9/common/vp9_thread_common.c | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/vp9/common/vp9_entropymode.c b/vp9/common/vp9_entropymode.c index bda824de3..9289fc9e1 100644 --- a/vp9/common/vp9_entropymode.c +++ b/vp9/common/vp9_entropymode.c @@ -381,7 +381,6 @@ void vp9_adapt_mode_probs(VP9_COMMON *cm) { } if (cm->tx_mode == TX_MODE_SELECT) { - int j; unsigned int branch_ct_8x8p[TX_SIZES - 3][2]; unsigned int branch_ct_16x16p[TX_SIZES - 2][2]; unsigned int branch_ct_32x32p[TX_SIZES - 1][2]; diff --git a/vp9/common/vp9_thread_common.c b/vp9/common/vp9_thread_common.c index b3d50162b..ad4478179 100644 --- a/vp9/common/vp9_thread_common.c +++ b/vp9/common/vp9_thread_common.c @@ -306,7 +306,6 @@ void vp9_loop_filter_alloc(VP9LfSync *lf_sync, VP9_COMMON *cm, int rows, CHECK_MEM_ERROR(cm, lf_sync->recon_done_mutex, vpx_malloc(sizeof(*lf_sync->recon_done_mutex) * rows)); if (lf_sync->recon_done_mutex) { - int i; for (i = 0; i < rows; ++i) { pthread_mutex_init(&lf_sync->recon_done_mutex[i], NULL); } @@ -315,7 +314,6 @@ void vp9_loop_filter_alloc(VP9LfSync *lf_sync, VP9_COMMON *cm, int rows, CHECK_MEM_ERROR(cm, lf_sync->recon_done_cond, vpx_malloc(sizeof(*lf_sync->recon_done_cond) * rows)); if (lf_sync->recon_done_cond) { - int i; for (i = 0; i < rows; ++i) { pthread_cond_init(&lf_sync->recon_done_cond[i], NULL); } |