summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2012-08-27 17:15:59 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-08-27 17:16:00 -0700
commit2352a815fe99a00702dd00c5d1c6cfdfadba10fd (patch)
tree522f85faa8a80d4f86d0659b7694d871bc160953 /media
parent68536901073cba8d673f410ebf79d44cd6c79e39 (diff)
parenta6195decfe4f9021bbbd7deb050495c33371366b (diff)
downloadframeworks_av-2352a815fe99a00702dd00c5d1c6cfdfadba10fd.zip
frameworks_av-2352a815fe99a00702dd00c5d1c6cfdfadba10fd.tar.gz
frameworks_av-2352a815fe99a00702dd00c5d1c6cfdfadba10fd.tar.bz2
Merge "Use new surface flinger API." into jb-mr1-dev
Diffstat (limited to 'media')
-rw-r--r--media/libstagefright/tests/SurfaceMediaSource_test.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/tests/SurfaceMediaSource_test.cpp b/media/libstagefright/tests/SurfaceMediaSource_test.cpp
index cc2aca7..a61d6a2 100644
--- a/media/libstagefright/tests/SurfaceMediaSource_test.cpp
+++ b/media/libstagefright/tests/SurfaceMediaSource_test.cpp
@@ -90,7 +90,7 @@ protected:
ASSERT_EQ(NO_ERROR, mComposerClient->initCheck());
mSurfaceControl = mComposerClient->createSurface(
- String8("Test Surface"), 0,
+ String8("Test Surface"),
getSurfaceWidth(), getSurfaceHeight(),
PIXEL_FORMAT_RGB_888, 0);