tree 5cb48ef420a5ae4fb56f49bd0f60f8ae06754cec
parent 346b6126d54bda4ddc705b27f49004b5cf3a2b3e
parent b755e3256510ecd325565d6b461d668d224445b1
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