summaryrefslogtreecommitdiff
path: root/vp9
diff options
context:
space:
mode:
authorJames Zern <jzern@google.com>2015-04-30 23:05:42 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-04-30 23:05:42 +0000
commit0ae1e4a95adfe89e5ae0b28dd55ee9491452cde4 (patch)
tree9820d8e4dcdc550a531798ac00fb7bdba2032d95 /vp9
parentfd90ce2711e551313e22d38892b5d30d9aefa6ba (diff)
parent9e81112df2be0a9544f6d9f76106f5deacd9c170 (diff)
downloadlibvpx-0ae1e4a95adfe89e5ae0b28dd55ee9491452cde4.tar
libvpx-0ae1e4a95adfe89e5ae0b28dd55ee9491452cde4.tar.gz
libvpx-0ae1e4a95adfe89e5ae0b28dd55ee9491452cde4.tar.bz2
libvpx-0ae1e4a95adfe89e5ae0b28dd55ee9491452cde4.zip
Merge "vp9_decodeframe: simplify compare_tile_buffers"
Diffstat (limited to 'vp9')
-rw-r--r--vp9/decoder/vp9_decodeframe.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/vp9/decoder/vp9_decodeframe.c b/vp9/decoder/vp9_decodeframe.c
index 264ad4422..81f87cdf7 100644
--- a/vp9/decoder/vp9_decodeframe.c
+++ b/vp9/decoder/vp9_decodeframe.c
@@ -1086,13 +1086,7 @@ static int tile_worker_hook(TileWorkerData *const tile_data,
static int compare_tile_buffers(const void *a, const void *b) {
const TileBuffer *const buf1 = (const TileBuffer*)a;
const TileBuffer *const buf2 = (const TileBuffer*)b;
- if (buf1->size < buf2->size) {
- return 1;
- } else if (buf1->size == buf2->size) {
- return 0;
- } else {
- return -1;
- }
+ return (int)(buf2->size - buf1->size);
}
static const uint8_t *decode_tiles_mt(VP9Decoder *pbi,