OSDN Git Service

am ff58698e: am f36ae7ca: Merge "Added support for 3GPP meta data atoms"
authorMarco Nelissen <marcone@google.com>
Mon, 19 Aug 2013 20:07:07 +0000 (13:07 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 19 Aug 2013 20:07:07 +0000 (13:07 -0700)
commit5eab65aa7bd40e907d11dca8aad69714ffef19f1
treec2e116316b06b0ae400d4659bfd11f920ad71cdb
parenta8542f05253e31a64428baf93a31183988a065bb
parentff58698ec7e0f32bf9f3e1758173fe170e17270c
am ff58698e: am f36ae7ca: Merge "Added support for 3GPP meta data atoms"

* commit 'ff58698ec7e0f32bf9f3e1758173fe170e17270c':
  Added support for 3GPP meta data atoms
media/libstagefright/MPEG4Extractor.cpp
media/libstagefright/include/MPEG4Extractor.h