tree da67912659aad67660d3eed1e0045793be5bfeea
parent 9b12bed6885c3dfe096cffa543f92178577e9008
parent d73fcdf91cbdf7afb0b44bc9a34718d677463389
author Wei Jia <wjia@google.com> 1496783607 +0000
committer android-build-merger <android-build-merger@google.com> 1496783607 +0000

Merge "m4v_h263: check header first before decoding a frame." into lmp-dev am: 6aed93d593 am: 8772f84f2c am: fc97c43c79 am: c572616245 am: 0c2592782f am: a4a232c7d4 am: d8de34f60c am: 8bd081a57f am: b73a717745 am: 53ee1b675b am: 6c58251e3d am: ce85c6646e
am: d73fcdf91c

Change-Id: I64c12885ae4044f9d7f79daafadbe52102b6f74e