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)
commitbe1cc822304d3a29c106ad5b6f330aed3e8c5658
treecca08baf5327fd30c0f257738d2871484fa39f87
parent726e4527b7a750e688fec4c1e7c5f7b9a33d1623
parenta57a9a491272aa884494b2ec7854960827a73742
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