tree ff918a257db11e9b7ee9b761af191bcfde1151d4
parent f6760786136ed46bcc9f71b6211e57a730bd9bf5
parent 589e2e74e429f2116f18463aeda9a0954cfd70ca
author Andreas Huber <andih@google.com> 1348860809 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1348860809 -0700

am 589e2e74: Merge "Add a way to configure an OMX encoder to emit SPS/PPS before IDR frames." into jb-mr1-dev

* commit '589e2e74e429f2116f18463aeda9a0954cfd70ca':
  Add a way to configure an OMX encoder to emit SPS/PPS before IDR frames.