diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2014-11-12 17:03:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-11-12 17:03:24 +0000 |
| commit | a82b5f575d0b7f9465cd879be04929fefd4cc5c5 (patch) | |
| tree | 61807e2ca7176a7fecf4750deb5d14e7d2e753ac | |
| parent | 43e10bb74913a9c9e739c1d4cacbed9be885ffa7 (diff) | |
| parent | 79d661f469c8c6a73634bc3d4770212bc8708619 (diff) | |
| download | frameworks_av-a82b5f575d0b7f9465cd879be04929fefd4cc5c5.zip frameworks_av-a82b5f575d0b7f9465cd879be04929fefd4cc5c5.tar.gz frameworks_av-a82b5f575d0b7f9465cd879be04929fefd4cc5c5.tar.bz2 | |
Merge "libstagefright: use __predict_false from bionic rather than CONDITION from log/log.h"
| -rw-r--r-- | media/libstagefright/MPEG4Writer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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; \ })) |