OSDN Git Service

Merge "handle error during flush in MediaPlayer.reset()" into lmp-dev
authorMarco Nelissen <marcone@google.com>
Wed, 20 Aug 2014 20:16:59 +0000 (20:16 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 19 Aug 2014 02:43:23 +0000 (02:43 +0000)
1  2 
media/libmediaplayerservice/nuplayer/NuPlayer.cpp
media/libstagefright/MediaCodec.cpp

Simple merge