tree 7a041b02fc032489245451799d8cb85ed5056bcb
parent db9de0538d61d0078b7fd498c6407464af2046d4
parent ce85c6646e8ec4791090231aa14d397b710536a3
author Wei Jia <wjia@google.com> 1496783224 +0000
committer android-build-merger <android-build-merger@google.com> 1496783224 +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

Change-Id: I8e17f4ce9a2425fcaad4aa10a80c7587545be5d8