tree b0809b0430af412a3229d938cefecbb15db87704
parent 008d0e95684e8e2fcd754a45ce04275cc087984c
parent d8de34f60cc31fefcca935c894c6ab309bfd76c6
author Wei Jia <wjia@google.com> 1496781912 +0000
committer android-build-merger <android-build-merger@google.com> 1496781912 +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

Change-Id: If0555114cd444c5340c5dbbd1e110a5d063ff210