tree 9728171c0df3e1e6940a0a5bc1800aa494ea5624
parent 6c58251e3d785e969efcb7ef542ef64ff18da0bc
parent b8eb299886a0f85bd9d44c9bf2f30488d9394b67
author Wei Jia <wjia@google.com> 1496783754 +0000
committer android-build-merger <android-build-merger@google.com> 1496783754 +0000

Merge "m4v_h263: update width/height only when they are valid." into klp-dev am: 2da03f40eb am: 5e9a9442a3 am: 36eb1039cf am: 1173c884db am: 3e99d14712 am: 0cb6c1f2b3 am: a0f88fe10b am: 3905eac9c0 am: 1c724844d8 am: ab6bb51371 am: 367499bc42 am: a087c3fc93
am: b8eb299886

Change-Id: I0d7576dfbe4c6c0a9b914b00508b81efac1d439c