OSDN Git Service

Merge "Do not wait forever for output buffers in OMXCodec.cpp and error out in case...
authorJames Dong <jdong@google.com>
Sun, 24 Jul 2011 21:40:08 +0000 (14:40 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Sun, 24 Jul 2011 21:40:08 +0000 (14:40 -0700)
commite432a0005180ba9ac2c1d7822c4761b475fddc51
tree88ed405f2e6d39e93fc332536319836562321f27
parentd40e2c67ed6423355aeb1292b33c2f8a20b3c84d
parentd9ac621f590c51bdc38b46d5aabba2dbc84cbd58
Merge "Do not wait forever for output buffers in OMXCodec.cpp and error out in case time out happens"
include/media/stagefright/OMXCodec.h
media/libstagefright/OMXCodec.cpp