OSDN Git Service

Merge "stagefright: MPEG4Extractor: allow \'hdlr\' box before first track" into klp-dev
authorJon Larimer <jlarimer@google.com>
Tue, 20 Oct 2015 21:12:16 +0000 (21:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 20 Oct 2015 21:12:16 +0000 (21:12 +0000)
commit781cd4f37d4b81a8e5af45a3ba6cdd4cdd209a3e
tree9e419be52af2e1d98ef404090af2f73ebfd108b1
parent5a018d15da438933c30de4b25bcff527331cf8df
parentb1a13d01dccbc48ea54aeb4a4ba7fce636ff1daa
Merge "stagefright: MPEG4Extractor: allow \'hdlr\' box before first track" into klp-dev
am: b1a13d01dc

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