am 1a29d836: am 31e323e6: Merge "Make sure we drain the avc software decoder\'s output queue once we run out of input data." into gingerbread

Merge commit '1a29d8361a03597115a998cc15860791f8ddd503'

* commit '1a29d8361a03597115a998cc15860791f8ddd503':
  Make sure we drain the avc software decoder's output queue once we run out of input data.