am cc6b941c: am 4374b23d: Merge "Make sure we drain the avc software...
am cc6b941c: am 4374b23d: Merge "Make sure we drain the avc software decoder\'s output queue once we run out of input data." into gingerbread
Merge commit 'cc6b941c'
* commit 'cc6b941c':
Make sure we drain the avc software decoder's output queue once we run out of input data.