OSDN Git Service

am beedd862: Merge "Return a runtime error instead of assertion if seeking beyond...
authorAndreas Huber <andih@google.com>
Thu, 6 Oct 2011 16:18:07 +0000 (09:18 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 6 Oct 2011 16:18:07 +0000 (09:18 -0700)
* commit 'beedd8627a82007de61480c9e794dd967b708ded':
  Return a runtime error instead of assertion if seeking beyond EOS in mpeg4 files.


Trivial merge