diff options
| author | Andreas Huber <andih@google.com> | 2010-09-16 11:39:43 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-16 11:39:43 -0700 |
| commit | ada349a3340d495a89c322dead7fea09d3538919 (patch) | |
| tree | 70c5b80bb5c9eebd9ef1edb17e826dc7baca7d17 /include/camera | |
| parent | 47dc308b114f2ee83f71bc9787db343ff3cc64fd (diff) | |
| parent | f868457219ca363d94d48d94ae6be39d7239052f (diff) | |
| download | frameworks_av-ada349a3340d495a89c322dead7fea09d3538919.zip frameworks_av-ada349a3340d495a89c322dead7fea09d3538919.tar.gz frameworks_av-ada349a3340d495a89c322dead7fea09d3538919.tar.bz2 | |
am 62d4ebc0: am 49e1ae22: Merge "Sometimes the avc software decoder will signal that a frame is ready but then unexpectedly fail to return the frame... stop asserting on that and return an error instead." into gingerbread
Merge commit '62d4ebc0423831dfd8165d359e5b809f00f60656'
* commit '62d4ebc0423831dfd8165d359e5b809f00f60656':
Sometimes the avc software decoder will signal that a frame is ready but then unexpectedly fail to return the frame... stop asserting on that and return an error instead.
Diffstat (limited to 'include/camera')
0 files changed, 0 insertions, 0 deletions