tree 862a76bb5c5fa1ed1e59a2f02da76ab893f1b18e
parent 846f79b30e249ebca7d95442907723a0d14601fa
parent 3eb2ff224a12b5670f4f62f07a47ffb2fde01548
author James Dong <jdong@google.com> 1282329709 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1282329709 -0700

am b755e325: Merge "Only add 4 bytes offset for the output media buffer when SPS is not received for SW AVC encoder" into gingerbread

Merge commit 'b755e3256510ecd325565d6b461d668d224445b1' into gingerbread-plus-aosp

* commit 'b755e3256510ecd325565d6b461d668d224445b1':
  Only add 4 bytes offset for the output media buffer when SPS is not received for SW AVC encoder