diff options
| author | Andreas Huber <andih@google.com> | 2010-09-28 11:48:44 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-28 11:48:44 -0700 |
| commit | 668549b81b97fe706d15d5f6d4b767f63796e022 (patch) | |
| tree | d0d7ba4f6fb3477b81dc3f5664f0151f482fb699 /include | |
| parent | cdcd43b47c881aa34b3a6c396e91d0c1b4f3674a (diff) | |
| parent | 8211da9eabe28037ebcc23bbfbbe20cb21cb0cdc (diff) | |
| download | frameworks_av-668549b81b97fe706d15d5f6d4b767f63796e022.zip frameworks_av-668549b81b97fe706d15d5f6d4b767f63796e022.tar.gz frameworks_av-668549b81b97fe706d15d5f6d4b767f63796e022.tar.bz2 | |
am 4769f579: Merge "Vorbis files may have more samples encoded that should be used, i.e. we have to trim samples at the end of the stream. This is crucial for proper looping of some audio files." into gingerbread
Merge commit '4769f57948455277d0670ef18f64824ca5d894c1' into gingerbread-plus-aosp
* commit '4769f57948455277d0670ef18f64824ca5d894c1':
Vorbis files may have more samples encoded that should be used, i.e. we have to trim samples at the end of the stream. This is crucial for proper looping of some audio files.
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/MetaData.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/media/stagefright/MetaData.h b/include/media/stagefright/MetaData.h index 1594e31..ab2f11d 100644 --- a/include/media/stagefright/MetaData.h +++ b/include/media/stagefright/MetaData.h @@ -95,6 +95,8 @@ enum { // Ogg files can be tagged to be automatically looping... kKeyAutoLoop = 'autL', // bool (int32_t) + + kKeyValidSamples = 'valD', // int32_t }; enum { |