diff options
| author | Chih-Hung Hsieh <chh@google.com> | 2014-12-17 23:43:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-12-17 23:43:59 +0000 |
| commit | 6f3b732b6f95e9b96172164cba13382ce64864ba (patch) | |
| tree | 7b9ffd4e62498fcbf16d49dadbe014daada2f793 | |
| parent | 09a1f34f2f45fe01b7dc6a15b15259ba61e47b5b (diff) | |
| parent | e1b2ccf317301af42bb4b6631a3bcd7d8f519d00 (diff) | |
| download | frameworks_av-6f3b732b6f95e9b96172164cba13382ce64864ba.zip frameworks_av-6f3b732b6f95e9b96172164cba13382ce64864ba.tar.gz frameworks_av-6f3b732b6f95e9b96172164cba13382ce64864ba.tar.bz2 | |
Merge "Fix wrong int argument of FOURCC."
| -rw-r--r-- | media/libstagefright/MPEG4Extractor.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp index 087f345..64ab2f7 100644 --- a/media/libstagefright/MPEG4Extractor.cpp +++ b/media/libstagefright/MPEG4Extractor.cpp @@ -1533,13 +1533,13 @@ status_t MPEG4Extractor::parseChunk(off64_t *offset, int depth) { break; } - // @xyz - case FOURCC('\xA9', 'x', 'y', 'z'): + // ©xyz + case FOURCC(0xA9, 'x', 'y', 'z'): { *offset += chunk_size; - // Best case the total data length inside "@xyz" box - // would be 8, for instance "@xyz" + "\x00\x04\x15\xc7" + "0+0/", + // Best case the total data length inside "©xyz" box + // would be 8, for instance "©xyz" + "\x00\x04\x15\xc7" + "0+0/", // where "\x00\x04" is the text string length with value = 4, // "\0x15\xc7" is the language code = en, and "0+0" is a // location (string) value with longitude = 0 and latitude = 0. |