diff options
| author | Mathias Agopian <mathias@google.com> | 2012-02-24 19:08:12 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-02-24 19:08:12 -0800 |
| commit | 1843df5b4f8f8f8394a96bcaeb5836d720ae9cf5 (patch) | |
| tree | c2be52b9aec3d9a84fbf44059aa86f233275141f /media | |
| parent | 37d825e72a6c606553a745da1212590a425996d3 (diff) | |
| parent | 9eeafeb52fecf90882e9b44eeefcb7c3e16aa915 (diff) | |
| download | frameworks_av-1843df5b4f8f8f8394a96bcaeb5836d720ae9cf5.zip frameworks_av-1843df5b4f8f8f8394a96bcaeb5836d720ae9cf5.tar.gz frameworks_av-1843df5b4f8f8f8394a96bcaeb5836d720ae9cf5.tar.bz2 | |
Merge "remove dependency on android_native{s_priv|buffer}.h"
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/colorconversion/SoftwareRenderer.cpp | 2 | ||||
| -rw-r--r-- | media/libstagefright/include/SoftwareRenderer.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/media/libstagefright/colorconversion/SoftwareRenderer.cpp b/media/libstagefright/colorconversion/SoftwareRenderer.cpp index e892f92..297f2c9 100644 --- a/media/libstagefright/colorconversion/SoftwareRenderer.cpp +++ b/media/libstagefright/colorconversion/SoftwareRenderer.cpp @@ -24,7 +24,7 @@ #include <media/stagefright/foundation/ADebug.h> #include <media/stagefright/MetaData.h> #include <surfaceflinger/Surface.h> -#include <ui/android_native_buffer.h> +#include <system/window.h> #include <ui/GraphicBufferMapper.h> #include <gui/ISurfaceTexture.h> diff --git a/media/libstagefright/include/SoftwareRenderer.h b/media/libstagefright/include/SoftwareRenderer.h index 8f2ea95..7ab0042 100644 --- a/media/libstagefright/include/SoftwareRenderer.h +++ b/media/libstagefright/include/SoftwareRenderer.h @@ -20,7 +20,7 @@ #include <media/stagefright/ColorConverter.h> #include <utils/RefBase.h> -#include <ui/android_native_buffer.h> +#include <system/window.h> namespace android { |