diff options
| author | Yaowu Xu <yaowu@google.com> | 2015-01-26 16:52:30 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2015-01-26 16:52:30 -0800 |
| commit | d987dc4fdb0507903f7b58a879ac32645c6513d1 (patch) | |
| tree | 9e1bae10528472324d95471747cbc34adc21765e /vp9/encoder | |
| parent | e7ef8ecefd4c7747be7d61ddc6c86633e5e47bc0 (diff) | |
| parent | 6d16f6c14c3d162217e6d90caae26d7458fe1029 (diff) | |
| download | libvpx-d987dc4fdb0507903f7b58a879ac32645c6513d1.tar libvpx-d987dc4fdb0507903f7b58a879ac32645c6513d1.tar.gz libvpx-d987dc4fdb0507903f7b58a879ac32645c6513d1.tar.bz2 libvpx-d987dc4fdb0507903f7b58a879ac32645c6513d1.zip | |
Merge "Fix MSVC warnings on conversion from int64 to int"
Diffstat (limited to 'vp9/encoder')
| -rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index e142a3181..4bcb65816 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -402,7 +402,7 @@ static int set_vt_partitioning(VP9_COMP *cpi, BLOCK_SIZE bsize, int mi_row, int mi_col, - int threshold, + int64_t threshold, BLOCK_SIZE bsize_min) { VP9_COMMON * const cm = &cpi->common; variance_node vt; |