diff options
| author | Marco Nelissen <marcone@google.com> | 2015-04-09 19:31:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-04-09 19:31:47 +0000 |
| commit | 38c9d6cfd2db353ebebf291589fcceceebb9f2b8 (patch) | |
| tree | 7fc717091f53546e0c5bc6c94429f11f519f17c9 /media | |
| parent | 1c4eddb16146855723d5854078ad0f6884f3f3f2 (diff) | |
| parent | 34630194376f3a0c204dc452f2652859367a6296 (diff) | |
| download | frameworks_av-38c9d6cfd2db353ebebf291589fcceceebb9f2b8.zip frameworks_av-38c9d6cfd2db353ebebf291589fcceceebb9f2b8.tar.gz frameworks_av-38c9d6cfd2db353ebebf291589fcceceebb9f2b8.tar.bz2 | |
Merge "ESQueue:use 0x000001 instead of 0x00000001 as sync word in H264/MPEG_VIDEO"
Diffstat (limited to 'media')
| -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 a605595..f257289 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; } |