OSDN Git Service

am c040e1e7: am 6f1dd757: Merge "SurfaceMediaSource: use the vid enc usage bit" into...
authorJamie Gennis <jgennis@google.com>
Wed, 30 Nov 2011 18:50:49 +0000 (10:50 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Nov 2011 18:50:49 +0000 (10:50 -0800)
commitcd9e929c8490d1410e6d99c9b54585cb2fea569c
tree0c7af0196b7825ef755512254220874186af4d1b
parentea9d51bd710e6739077a3700f27a1c37767a2f6d
parent15031854d15ffcc5c955290f61aa59aa09e1fde9
am c040e1e7: am 6f1dd757: Merge "SurfaceMediaSource: use the vid enc usage bit" into ics-mr1

* commit 'c040e1e77923d81050f2d3dbdac5d07e01be72f6':
  SurfaceMediaSource: use the vid enc usage bit
media/libstagefright/SurfaceMediaSource.cpp