commit 74d808e9a6ab4dee6f30790eda5bf67e493a8ea5
author Iliyan Malchev <malchev@google.com> Tue May 03 16:43:21 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 03 16:43:21 2011 -0700
tree 2ac881e742de669b7ca69cb6cc50992c672a6ce2
parent e6815bf8b4eaf9cc861e389cbebe3d7412698e9f
parent b003895a249f1298c311f513bbb0bf96e3902ef4

Merge "android_native_buffer_t --> ANativeWindowBuffer"

libvideoeditor/lvpp/PreviewRenderer.cpp

diff --git a/libvideoeditor/lvpp/PreviewRenderer.cpp b/libvideoeditor/lvpp/PreviewRenderer.cpp
index cfded72..8f172f3 100755
--- a/libvideoeditor/lvpp/PreviewRenderer.cpp
+++ b/libvideoeditor/lvpp/PreviewRenderer.cpp
@@ -207,7 +207,7 @@
 //

 void PreviewRenderer::render(

         const void *data, size_t size, void *platformPrivate) {

-    android_native_buffer_t *buf;

+    ANativeWindowBuffer *buf;

     int err;

 

     if ((err = mSurface->dequeueBuffer(mSurface.get(), &buf)) != 0) {

libvideoeditor/lvpp/PreviewRenderer.h

diff --git a/libvideoeditor/lvpp/PreviewRenderer.h b/libvideoeditor/lvpp/PreviewRenderer.h
index 876ca16..ccfcf86 100755
--- a/libvideoeditor/lvpp/PreviewRenderer.h
+++ b/libvideoeditor/lvpp/PreviewRenderer.h
@@ -72,7 +72,7 @@
     size_t mDisplayWidth, mDisplayHeight;

     size_t mDecodedWidth, mDecodedHeight;

 

-    android_native_buffer_t *mBuf;

+    ANativeWindowBuffer *mBuf;

 

     PreviewRenderer(const PreviewRenderer &);

     PreviewRenderer &operator=(const PreviewRenderer &);