tree f9dffd18d43142894111e2d5b905ba94f1b94e01
parent 933344c82c76c0acc36b209bb9ddf0454b2622de
parent 1b8ba61cb178bb6429bd214db9c615c350d0823a
author Andreas Huber <andih@google.com> 1317917887 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1317917887 -0700

am beedd862: Merge "Return a runtime error instead of assertion if seeking beyond EOS in mpeg4 files."

* commit 'beedd8627a82007de61480c9e794dd967b708ded':
  Return a runtime error instead of assertion if seeking beyond EOS in mpeg4 files.