diff options
| author | Lajos Molnar <lajos@google.com> | 2013-05-29 15:21:25 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-29 15:21:25 -0700 |
| commit | c3a73bb6446df8c1387a2b3ff9357190f515eccb (patch) | |
| tree | cf0c5f868e7fbd3b8e543b20d3d0aa5dae5133f1 /media | |
| parent | b07198a11f251d0cf0f4b3084764323f2bd38e9e (diff) | |
| parent | 1cd68527a6c4cc92608dfe8a8c6ba51e5e2c4fc2 (diff) | |
| download | frameworks_av-c3a73bb6446df8c1387a2b3ff9357190f515eccb.zip frameworks_av-c3a73bb6446df8c1387a2b3ff9357190f515eccb.tar.gz frameworks_av-c3a73bb6446df8c1387a2b3ff9357190f515eccb.tar.bz2 | |
am 1cd68527: am 41688da2: Merge "MediaMuxer: Remove SAMPLE_FLAG_SYNC flag" into jb-mr2-dev
* commit '1cd68527a6c4cc92608dfe8a8c6ba51e5e2c4fc2':
MediaMuxer: Remove SAMPLE_FLAG_SYNC flag
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/MediaMuxer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ status_t MediaMuxer::writeSampleData(const sp<ABuffer> &buffer, size_t trackInde // 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); } |