| commit | 34d632f3e8381caebc838ef09feda3bf403dfa2a | [log] [tgz] |
|---|---|---|
| author | Andy Hung <hunga@google.com> | Tue May 20 17:37:15 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue May 20 17:37:15 2014 +0000 |
| tree | d68f615dec973c3bfaf906f30f395e6871dcdf82 | |
| parent | 93c6fa7508cd0f5bb0ec80ea29ef8bfab4a6015f [diff] | |
| parent | 14ead787204a1bfc13e92067691efaefd624fcae [diff] |
Merge "Fix OGG recognition for 64 bit"
diff --git a/media/libmediaplayerservice/MediaPlayerFactory.cpp b/media/libmediaplayerservice/MediaPlayerFactory.cpp index 74e5013..9b239b1 100644 --- a/media/libmediaplayerservice/MediaPlayerFactory.cpp +++ b/media/libmediaplayerservice/MediaPlayerFactory.cpp
@@ -186,7 +186,7 @@ read(fd, buf, sizeof(buf)); lseek(fd, offset, SEEK_SET); - long ident = *((long*)buf); + uint32_t ident = *((uint32_t*)buf); // Ogg vorbis? if (ident == 0x5367674f) // 'OggS'