commit 7d58810be46a86fa5c66d6d53d2453a5accc76f8
author Lajos Molnar <lajos@google.com> Thu May 26 17:33:13 2016 -0700
committer Lajos Molnar <lajos@google.com> Thu May 26 17:33:57 2016 -0700
tree fbb22e93ddbe255f2f3add4e490a0182ce67a825
parent b4eea9fa629f44ba17731a6152c1a083a559e851

stagefright: fix PPS packaging into AVCC

Bug: 28943869
Change-Id: Iefe9ef3ec4ec4fe31cd5b0e90f1796130f8e9302

media/libstagefright/Utils.cpp

diff --git a/media/libstagefright/Utils.cpp b/media/libstagefright/Utils.cpp
index c461ca0..c343dee 100644
--- a/media/libstagefright/Utils.cpp
+++ b/media/libstagefright/Utils.cpp
@@ -1114,7 +1114,7 @@
     int numpicparamsoffset = avccidx;
     avccidx++;
     do {
-        i = findNextNalStartCode(csd0->data() + i, csd0->size() - i) - csd0->data();
+        i = findNextNalStartCode(csd1->data() + i, csd1->size() - i) - csd1->data();
         ALOGV("block at %zu, last was %d", i, lastparamoffset);
         if (lastparamoffset > 0) {
             int size = i - lastparamoffset;