am 31e323e6: Merge "Make sure we drain the avc software decoder\'s output...
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 '31e323e6' into gingerbread-plus-aosp
* commit '31e323e6':
Make sure we drain the avc software decoder's output queue once we run out of input data.