OSDN Git Service

am 62d4ebc0: am 49e1ae22: Merge "Sometimes the avc software decoder will signal that...
authorAndreas Huber <andih@google.com>
Thu, 16 Sep 2010 18:39:43 +0000 (11:39 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 16 Sep 2010 18:39:43 +0000 (11:39 -0700)
commit63ce34be624dcc1f55635de7f128fc4e9abbbcbc
tree488db13a095c1b8af7bc6468dc98376c1bcdf75c
parent94c6e7e13577c7fc3e342fe70e0b569c4a153ac2
parent2b9f9821b10a141607da04d914b260ccfe817bed
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.