diff options
| author | Robert Shih <robertshih@google.com> | 2015-04-03 21:34:55 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-03 21:34:55 +0000 |
| commit | f876b18295d3e5d9a3ce8d0be59694e4635d6024 (patch) | |
| tree | a1c3000d33d73adebb4a24b788019009de78ba60 | |
| parent | 002135d149d8604e972d1b353d768f293fbce15f (diff) | |
| parent | 13561c89d6d8f6980625192bd75f9fd6cfb102a3 (diff) | |
| download | frameworks_av-f876b18295d3e5d9a3ce8d0be59694e4635d6024.zip frameworks_av-f876b18295d3e5d9a3ce8d0be59694e4635d6024.tar.gz frameworks_av-f876b18295d3e5d9a3ce8d0be59694e4635d6024.tar.bz2 | |
Merge "ESQueue:use 0x000001 instead of 0x00000001 as sync word in H264/MPEG_VIDEO"
| -rw-r--r-- | media/libstagefright/mpeg2ts/ESQueue.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libstagefright/mpeg2ts/ESQueue.cpp b/media/libstagefright/mpeg2ts/ESQueue.cpp index 88da275..b17985c 100644 --- a/media/libstagefright/mpeg2ts/ESQueue.cpp +++ b/media/libstagefright/mpeg2ts/ESQueue.cpp @@ -257,8 +257,8 @@ status_t ElementaryStreamQueue::appendData( uint8_t *ptr = (uint8_t *)data; ssize_t startOffset = -1; - for (size_t i = 0; i + 3 < size; ++i) { - if (!memcmp("\x00\x00\x00\x01", &ptr[i], 4)) { + for (size_t i = 0; i + 2 < size; ++i) { + if (!memcmp("\x00\x00\x01", &ptr[i], 3)) { startOffset = i; break; } |