diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-08-20 09:40:12 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-20 09:40:12 -0700 |
| commit | 3b939a5e893ccfe87f5b7b3fe229439a9b2fc87a (patch) | |
| tree | 19e908b8090ddc52139e422fae37264198c0109c | |
| parent | 523c09d56c78933eea7fb4f028e0bfa595ca82b1 (diff) | |
| parent | 02a4ec216cf5ca903e1765ca3e7ff2985436b236 (diff) | |
| download | frameworks_av-3b939a5e893ccfe87f5b7b3fe229439a9b2fc87a.zip frameworks_av-3b939a5e893ccfe87f5b7b3fe229439a9b2fc87a.tar.gz frameworks_av-3b939a5e893ccfe87f5b7b3fe229439a9b2fc87a.tar.bz2 | |
am 02a4ec21: Merge "avcenc: Remove a leftover define"
* commit '02a4ec216cf5ca903e1765ca3e7ff2985436b236':
avcenc: Remove a leftover define
| -rw-r--r-- | media/libstagefright/codecs/avc/enc/Android.mk | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/media/libstagefright/codecs/avc/enc/Android.mk b/media/libstagefright/codecs/avc/enc/Android.mk index 3678329..845d1d3 100644 --- a/media/libstagefright/codecs/avc/enc/Android.mk +++ b/media/libstagefright/codecs/avc/enc/Android.mk @@ -48,7 +48,6 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/../common LOCAL_CFLAGS := \ - -D__arm__ \ -DOSCL_IMPORT_REF= -DOSCL_UNUSED_ARG= -DOSCL_EXPORT_REF= |