OSDN Git Service

Merge "media: Fix a typo in parsing nclc atom." into nyc-dev
authorMarco Nelissen <marcone@google.com>
Wed, 13 Sep 2017 20:08:06 +0000 (20:08 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 13 Sep 2017 20:08:06 +0000 (20:08 +0000)
commitd6768a3f03883e281669e4931f73d3367927c709
treeb95e0f5b208e138df93b41af6801b67a2ca06d4a
parent74f84d987be37b971f02eb0b4d824599626a9936
parent08ef71975b37749b3dfb08c74089bb93c1ab8871
Merge "media: Fix a typo in parsing nclc atom." into nyc-dev
am: 08ef71975b

Change-Id: I73ec3365c21238f7ca328763df52121b43911e04
media/libstagefright/MPEG4Extractor.cpp