diff options
| author | Marco Nelissen <marcone@google.com> | 2015-04-09 19:48:53 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-09 19:48:53 +0000 |
| commit | b7427c0a77b492307c6c2e1f643927f9ca64847d (patch) | |
| tree | 16650291dd8064da8f48f3f0a976272c50c13f38 /media | |
| parent | 65b351c9e6b2de28d9517d90c42965d0fb3c5cd6 (diff) | |
| parent | 8c6f1d972aa71806d67a220081d0031b91c09a8c (diff) | |
| download | frameworks_av-b7427c0a77b492307c6c2e1f643927f9ca64847d.zip frameworks_av-b7427c0a77b492307c6c2e1f643927f9ca64847d.tar.gz frameworks_av-b7427c0a77b492307c6c2e1f643927f9ca64847d.tar.bz2 | |
am 8c6f1d97: am 38c9d6cf: Merge "ESQueue:use 0x000001 instead of 0x00000001 as sync word in H264/MPEG_VIDEO"
* commit '8c6f1d972aa71806d67a220081d0031b91c09a8c':
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; } |