Merge "MPEG4Extractor: check size for yrrc box" into lmp-dev am: d971d18873 am: 2ace1...

author Dongwon Kang <dwkang@google.com>

Sat, 17 Jun 2017 05:06:09 +0000 (05:06 +0000)

committer android-build-merger <android-build-merger@google.com>

Sat, 17 Jun 2017 05:06:09 +0000 (05:06 +0000)
author Dongwon Kang <dwkang@google.com>
Sat, 17 Jun 2017 05:06:09 +0000 (05:06 +0000)
committer android-build-merger <android-build-merger@google.com>
Sat, 17 Jun 2017 05:06:09 +0000 (05:06 +0000)
diff --cc media/libstagefright/MPEG4Extractor.cpp

index 885f2cb,f0c633b..f6242d1

mode 100644,100755..100644
--- 1/media/libstagefright/MPEG4Extractor.cpp
--- 2/media/libstagefright/MPEG4Extractor.cpp
+++ b/media/libstagefright/MPEG4Extractor.cpp
author	Dongwon Kang <dwkang@google.com>
	Sat, 17 Jun 2017 05:06:09 +0000 (05:06 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Sat, 17 Jun 2017 05:06:09 +0000 (05:06 +0000)