Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(12)

Unified Diff: source/libvpx/vp9/common/vp9_tile_common.c

Issue 1302353004: libvpx: Pull from upstream (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/libvpx.git@master
Patch Set: Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « source/libvpx/vp9/common/vp9_thread_common.c ('k') | source/libvpx/vp9/decoder/vp9_decodeframe.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: source/libvpx/vp9/common/vp9_tile_common.c
diff --git a/source/libvpx/vp9/common/vp9_tile_common.c b/source/libvpx/vp9/common/vp9_tile_common.c
index 7a20e0a9e7337b6042acff4fde7c414e929b6fa3..f2764126d7cb1b252181b90053460280d485b9d8 100644
--- a/source/libvpx/vp9/common/vp9_tile_common.c
+++ b/source/libvpx/vp9/common/vp9_tile_common.c
@@ -18,7 +18,7 @@
static int get_tile_offset(int idx, int mis, int log2) {
const int sb_cols = mi_cols_aligned_to_sb(mis) >> MI_BLOCK_SIZE_LOG2;
const int offset = ((idx * sb_cols) >> log2) << MI_BLOCK_SIZE_LOG2;
- return MIN(offset, mis);
+ return VPXMIN(offset, mis);
}
void vp9_tile_set_row(TileInfo *tile, const VP9_COMMON *cm, int row) {
« no previous file with comments | « source/libvpx/vp9/common/vp9_thread_common.c ('k') | source/libvpx/vp9/decoder/vp9_decodeframe.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698