tree 51ca172fb9d89b8b9bdb1ed949b3566046540861
parent 0e4e831110ace24dd3e9eed19763d4aa6b760710
parent 70a957cef141437cdf84e19c2eaeabdfb85c6542
author Andreas Huber <andih@google.com> 1326907932 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1326907932 -0800

am 70a957ce: Merge "AVIExtractor: adding a H264 fourCC which is also specified in the reference. (H264 code can be found avi file which is encoded with FFmpeg.)"

* commit '70a957cef141437cdf84e19c2eaeabdfb85c6542':
  AVIExtractor: adding a H264 fourCC which is also specified in the reference. (H264 code can be found avi file which is encoded with FFmpeg.)