diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-08-20 10:29:34 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-20 10:29:34 -0700 |
| commit | 07c6ddb431c784a24a70a5a91d8a454e9c1dde5d (patch) | |
| tree | 166f453fbf3717c6b25a7168e8bf6742a4d16f97 /media | |
| parent | 53ae1640ffbfc690962f7f94694b02680c6f66cb (diff) | |
| parent | 3b939a5e893ccfe87f5b7b3fe229439a9b2fc87a (diff) | |
| download | frameworks_av-07c6ddb431c784a24a70a5a91d8a454e9c1dde5d.zip frameworks_av-07c6ddb431c784a24a70a5a91d8a454e9c1dde5d.tar.gz frameworks_av-07c6ddb431c784a24a70a5a91d8a454e9c1dde5d.tar.bz2 | |
am 3b939a5e: am 02a4ec21: Merge "avcenc: Remove a leftover define"
* commit '3b939a5e893ccfe87f5b7b3fe229439a9b2fc87a':
avcenc: Remove a leftover define
Diffstat (limited to 'media')
| -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 d9ebdf5..cffe469 100644 --- a/media/libstagefright/codecs/avc/enc/Android.mk +++ b/media/libstagefright/codecs/avc/enc/Android.mk @@ -49,7 +49,6 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/../common LOCAL_CFLAGS := \ - -D__arm__ \ -DOSCL_IMPORT_REF= -DOSCL_UNUSED_ARG= -DOSCL_EXPORT_REF= |