OSDN Git Service

Merge "stagefright: MPEG4Extractor: allow \'hdlr\' box before first track" into klp...
authorJon Larimer <jlarimer@google.com>
Tue, 20 Oct 2015 21:19:00 +0000 (21:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 20 Oct 2015 21:19:00 +0000 (21:19 +0000)
commit8565726f5775a6db97a394aa18a1f6b0e1ce69b7
tree7e90c9176d5281969e07a6e2611292c237c09515
parentf70b69a8b5ed044112516bf69f69905e521070b6
parent781cd4f37d4b81a8e5af45a3ba6cdd4cdd209a3e
Merge "stagefright: MPEG4Extractor: allow \'hdlr\' box before first track" into klp-dev am: b1a13d01dc
am: 781cd4f37d

* commit '781cd4f37d4b81a8e5af45a3ba6cdd4cdd209a3e':
  stagefright: MPEG4Extractor: allow 'hdlr' box before first track
media/libstagefright/MPEG4Extractor.cpp