am 5bb3129c: (-s ours) am a2616220: am 5e57c2cf: Merge "Stagefright: Return error if codec takes too long to return a buffer."

Browse Source

* commit '5bb3129c7eabce34d7c1469826e1795d4b225bb3':
  Stagefright: Return error if codec takes too long to return a buffer.

...

This commit is contained in:

Jean-Baptiste Queru 2011-08-01 14:10:39 -07:00 committed by Android Git Automerger

parent 45923cdc11 0581cb2681

commit 2f7b9bf2d1

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available