Merge "Do not wait forever for output buffers in OMXCodec.cpp and error out in case...

author James Dong <jdong@google.com>

Sun, 24 Jul 2011 21:40:08 +0000 (14:40 -0700)

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

Sun, 24 Jul 2011 21:40:08 +0000 (14:40 -0700)
author James Dong <jdong@google.com>
Sun, 24 Jul 2011 21:40:08 +0000 (14:40 -0700)
committer Android (Google) Code Review <android-gerrit@google.com>
Sun, 24 Jul 2011 21:40:08 +0000 (14:40 -0700)
diff --cc include/media/stagefright/OMXCodec.h
Simple merge
diff --cc media/libstagefright/OMXCodec.cpp
Simple merge
author	James Dong <jdong@google.com>
	Sun, 24 Jul 2011 21:40:08 +0000 (14:40 -0700)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Sun, 24 Jul 2011 21:40:08 +0000 (14:40 -0700)
		1	2
include/media/stagefright/OMXCodec.h	patch \|	diff1 \|	diff2 \|	blob \| history
media/libstagefright/OMXCodec.cpp	patch \|	diff1 \|	diff2 \|	blob \| history