Merge "Adding Metadata mode to SurfaceMediaSource"

author Pannag Sanketi <psanketi@google.com>

Mon, 25 Jul 2011 22:00:16 +0000 (15:00 -0700)

committer Android (Google) Code Review <android-gerrit@google.com>

Mon, 25 Jul 2011 22:00:16 +0000 (15:00 -0700)
author Pannag Sanketi <psanketi@google.com>
Mon, 25 Jul 2011 22:00:16 +0000 (15:00 -0700)
committer Android (Google) Code Review <android-gerrit@google.com>
Mon, 25 Jul 2011 22:00:16 +0000 (15:00 -0700)
diff --cc include/media/stagefright/SurfaceMediaSource.h
Simple merge
diff --cc media/libstagefright/SurfaceMediaSource.cpp
Simple merge
author	Pannag Sanketi <psanketi@google.com>
	Mon, 25 Jul 2011 22:00:16 +0000 (15:00 -0700)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Mon, 25 Jul 2011 22:00:16 +0000 (15:00 -0700)
		1	2
include/media/stagefright/SurfaceMediaSource.h	patch \|	diff1 \|	diff2 \|	blob \| history
media/libstagefright/SurfaceMediaSource.cpp	patch \|	diff1 \|	diff2 \|	blob \| history