commit fb5cee14445622010af46da1fe9a013fe3868d48
author The Android Automerger <android-build@google.com> Thu May 30 05:55:32 2013 -0700
committer The Android Automerger <android-build@google.com> Thu May 30 05:55:32 2013 -0700
tree 3400fb46bc247f96d17b17463955ebbff1dd0e7b
parent 41688da226e91c97ea3b2fe096044e1e5b0520bc
parent 8617908345eff421b629d82b32f79e44efbf8de3

merge in jb-mr2-release history after reset to jb-mr2-dev

include/media/stagefright/MediaMuxer.h

diff --git a/include/media/stagefright/MediaMuxer.h b/include/media/stagefright/MediaMuxer.h
index fad319f..c1fdbad 100644
--- a/include/media/stagefright/MediaMuxer.h
+++ b/include/media/stagefright/MediaMuxer.h
@@ -41,12 +41,6 @@
 struct MediaMuxer : public RefBase {
 public:
     // Please update media/java/android/media/MediaMuxer.java if the
-    // SampleFlags is updated.
-    enum SampleFlags {
-        SAMPLE_FLAG_SYNC = 1,
-    };
-
-    // Please update media/java/android/media/MediaMuxer.java if the
     // OutputFormat is updated.
     enum OutputFormat {
         OUTPUT_FORMAT_MPEG_4 = 0,

media/libstagefright/MediaMuxer.cpp

diff --git a/media/libstagefright/MediaMuxer.cpp b/media/libstagefright/MediaMuxer.cpp
index 388c65b..94ce5de 100644
--- a/media/libstagefright/MediaMuxer.cpp
+++ b/media/libstagefright/MediaMuxer.cpp
@@ -161,7 +161,7 @@
     // Just set the kKeyDecodingTime as the presentation time for now.
     sampleMetaData->setInt64(kKeyDecodingTime, timeUs);
 
-    if (flags & SAMPLE_FLAG_SYNC) {
+    if (flags & MediaCodec::BUFFER_FLAG_SYNCFRAME) {
         sampleMetaData->setInt32(kKeyIsSyncFrame, true);
     }