diff options
| author | Andreas Huber <andih@google.com> | 2012-01-18 09:29:56 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-01-18 09:29:56 -0800 |
| commit | 70a957cef141437cdf84e19c2eaeabdfb85c6542 (patch) | |
| tree | 9ff0bbc079f2dbd9ed5ea1b8cde6749a6659aafd /media | |
| parent | f429b6a9011bd5408fb0ecba2a1f9b0167178134 (diff) | |
| parent | 33faba0ac3c7ec61d63257954392ccb421d85986 (diff) | |
| download | frameworks_base-70a957cef141437cdf84e19c2eaeabdfb85c6542.zip frameworks_base-70a957cef141437cdf84e19c2eaeabdfb85c6542.tar.gz frameworks_base-70a957cef141437cdf84e19c2eaeabdfb85c6542.tar.bz2 | |
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.)"
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/AVIExtractor.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/media/libstagefright/AVIExtractor.cpp b/media/libstagefright/AVIExtractor.cpp index a3187b7..5a6211e 100644 --- a/media/libstagefright/AVIExtractor.cpp +++ b/media/libstagefright/AVIExtractor.cpp @@ -577,6 +577,7 @@ static const char *GetMIMETypeForHandler(uint32_t handler) { case FOURCC('a', 'v', 'c', '1'): case FOURCC('d', 'a', 'v', 'c'): case FOURCC('x', '2', '6', '4'): + case FOURCC('H', '2', '6', '4'): case FOURCC('v', 's', 's', 'h'): return MEDIA_MIMETYPE_VIDEO_AVC; |