commit 79d661f469c8c6a73634bc3d4770212bc8708619
author Mark Salyzyn <salyzyn@google.com> Tue Nov 11 15:28:14 2014 -0800
committer Mark Salyzyn <salyzyn@google.com> Tue Nov 11 15:28:14 2014 -0800
tree 61807e2ca7176a7fecf4750deb5d14e7d2e753ac
parent 43e10bb74913a9c9e739c1d4cacbed9be885ffa7

libstagefright: use __predict_false from bionic rather than CONDITION from log/log.h

Change-Id: Ieb07a4f58c96326553e87dacca11e3980e283dc8

media/libstagefright/MPEG4Writer.cpp

diff --git a/media/libstagefright/MPEG4Writer.cpp b/media/libstagefright/MPEG4Writer.cpp
index 4b8440b..f6525ae 100644
--- a/media/libstagefright/MPEG4Writer.cpp
+++ b/media/libstagefright/MPEG4Writer.cpp
@@ -42,7 +42,7 @@
 #include "include/ESDS.h"
 
 #define WARN_UNLESS(condition, message, ...) \
-( (CONDITION(condition)) ? false : ({ \
+( (__predict_false(condition)) ? false : ({ \
     ALOGW("Condition %s failed "  message, #condition, ##__VA_ARGS__); \
     true; \
 }))