commit 0ba49a588bf9d5d094951ab04e3508792ed40316
author Sebastien Alaiwan <sebastien.alaiwan@allegrodvt.com> Mon Jun 19 11:58:18 2017 +0200
committer Sebastien Alaiwan <sebastien.alaiwan@allegrodvt.com> Tue Jun 20 04:47:21 2017 +0000
tree 3dc2a7fc31a397ce5ee5ee8f1101d6aafc3b1c54
parent 918c3c113dea4f4ff541476cce8043e0dd700352

Use AOMMAX instead of ternary

Change-Id: Icfe43e3eda3dcdf5a6d5209e60b842e950655678

av1/av1_cx_iface.c

diff --git a/av1/av1_cx_iface.c b/av1/av1_cx_iface.c
index b7f66be..e84c9e7 100644
--- a/av1/av1_cx_iface.c
+++ b/av1/av1_cx_iface.c
@@ -1024,8 +1024,8 @@
   // Add the number of frames to the marker byte
   marker |= ctx->pending_frame_count - 1;
   for (int i = 0; i < ctx->pending_frame_count - 1; i++) {
-    const size_t frame_sz = (unsigned int)ctx->pending_frame_sizes[i] - 1;
-    max_frame_sz = frame_sz > max_frame_sz ? frame_sz : max_frame_sz;
+    const size_t frame_sz = ctx->pending_frame_sizes[i] - 1;
+    max_frame_sz = AOMMAX(frame_sz, max_frame_sz);
   }
 
   // Choose the magnitude