Merge commit '7b2ed5d7d607e435b88ea75db3a1a43a00a86275' into gingerbread-plus-aosp * commit '7b2ed5d7d607e435b88ea75db3a1a43a00a86275': Depending on our preference to write 2-byte or 4-byte NALs, patch the codec specific data 'avcC' accordingly.
Merge commit '7b2ed5d7d607e435b88ea75db3a1a43a00a86275' into gingerbread-plus-aosp * commit '7b2ed5d7d607e435b88ea75db3a1a43a00a86275': Depending on our preference to write 2-byte or 4-byte NALs, patch the codec specific data 'avcC' accordingly.