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 /include | |
| 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 'include')
| -rw-r--r-- | include/media/stagefright/MediaMuxer.h | 6 |
1 files changed, 0 insertions, 6 deletions
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 MPEG4Writer; 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, |