diff options
| author | Andreas Huber <andih@google.com> | 2009-12-11 15:44:59 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-11 15:44:59 -0800 |
| commit | 4f26feda50cc4c51d90c93156afd03c380b9a42e (patch) | |
| tree | 331f6d22618cf81cc876c03d160507cbc5816819 /include | |
| parent | c9546b4ded4db4bc73528664816c146c97d0e1d3 (diff) | |
| parent | b841f14f8e51f2365945281fbfa54ef6a1b1b5a6 (diff) | |
| download | frameworks_av-4f26feda50cc4c51d90c93156afd03c380b9a42e.zip frameworks_av-4f26feda50cc4c51d90c93156afd03c380b9a42e.tar.gz frameworks_av-4f26feda50cc4c51d90c93156afd03c380b9a42e.tar.bz2 | |
am 08945576: Merge change I9ac0777e into eclair-mr2
Merge commit '089455760c05289c1315268a6cb896577ceebc64' into eclair-mr2-plus-aosp
* commit '089455760c05289c1315268a6cb896577ceebc64':
Initial checkin of software AMR NB encoder based on PV source code.
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/MetaData.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/media/stagefright/MetaData.h b/include/media/stagefright/MetaData.h index 583128f..c6ac6c2 100644 --- a/include/media/stagefright/MetaData.h +++ b/include/media/stagefright/MetaData.h @@ -34,7 +34,7 @@ enum { kKeyHeight = 'heig', kKeyChannelCount = '#chn', kKeySampleRate = 'srte', - kKeyBitRate = 'brte', + kKeyBitRate = 'brte', // int32_t (bps) kKeyESDS = 'esds', // raw data kKeyAVCC = 'avcc', // raw data kKeyWantsNALFragments = 'NALf', |