| commit | b786ef9eef39ed1fa1d69e727964ab8e45aa6947 | [log] [tgz] |
|---|---|---|
| author | Deva Ramasubramanian <dramasub@codeaurora.org> | Thu Feb 27 18:08:05 2014 -0800 |
| committer | Deva Ramasubramanian <dramasub@codeaurora.org> | Mon Mar 03 12:28:04 2014 -0800 |
| tree | 81de2bfee6e324998e835c4470e9350997b393cd | |
| parent | ed612d337b369609813a0e3a7a8936732e9421df [diff] |
mm-video: vidc: Fix bugs introduced via merge conflict Fix a couple of bugs introduced by bad conflict resolutions. A couple of `if(...)` should be `else if (...)`. This caused setting of EncoderMultislice extradata to always fail. Change-Id: I07aeb61b8eb53ebd5128b8d700fa87e8c2feb97b