summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/MediaCodec.cpp
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2014-08-20 19:44:54 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-08-19 02:43:23 +0000
commit4deb606bca47f971f1ca05e44b934c5328cfb6b7 (patch)
tree3f7ada4d416ade35b2f6af54eebf06bd1ad08134 /media/libstagefright/MediaCodec.cpp
parentbb137ef84e6308fb4f977ebf757cf3559e9cce71 (diff)
parenteb645a0d1820b227af287a5309f017afadbab4e3 (diff)
downloadframeworks_av-4deb606bca47f971f1ca05e44b934c5328cfb6b7.zip
frameworks_av-4deb606bca47f971f1ca05e44b934c5328cfb6b7.tar.gz
frameworks_av-4deb606bca47f971f1ca05e44b934c5328cfb6b7.tar.bz2
Merge "Fix NuPlayer deadlock" into lmp-dev
Diffstat (limited to 'media/libstagefright/MediaCodec.cpp')
0 files changed, 0 insertions, 0 deletions