tree 0b3f5ad16611b40b465683ed2f3e7a025cf223b7
parent cc371128f9280799ec2101a888540e98007eaf18
parent 26300b972d40cba24432257d47264d57f52580ab
author Wei Jia <wjia@google.com> 1496784320 +0000
committer android-build-merger <android-build-merger@google.com> 1496784320 +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
am: 26300b972d

Change-Id: Ia2b6e580142a210ff5f3acef64501df1ee11900b