diff options
| author | Andreas Huber <andih@google.com> | 2010-08-09 20:00:25 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-09 20:00:25 -0700 |
| commit | 0cde1a77ce02df9f0ab08d836b491bf8e809bf35 (patch) | |
| tree | 0a338cada6f6d601f8bcbbf17209b98989f19ac3 /media/libstagefright/Android.mk | |
| parent | bc417c0531332635df9525df4683274a08fb987f (diff) | |
| parent | 70324dce016db79767140fdd982bfddd1401da95 (diff) | |
| download | frameworks_av-0cde1a77ce02df9f0ab08d836b491bf8e809bf35.zip frameworks_av-0cde1a77ce02df9f0ab08d836b491bf8e809bf35.tar.gz frameworks_av-0cde1a77ce02df9f0ab08d836b491bf8e809bf35.tar.bz2 | |
am e14923b0: am 4edf85ab: Merge "Support for extracting G.711 a-law and mu-law audio from WAV files and a corresponding software decoder." into gingerbread
Merge commit 'e14923b0c80b2e73e69b7917c1f170b356592d29'
* commit 'e14923b0c80b2e73e69b7917c1f170b356592d29':
Support for extracting G.711 a-law and mu-law audio from WAV files and a corresponding software decoder.
Diffstat (limited to 'media/libstagefright/Android.mk')
| -rw-r--r-- | media/libstagefright/Android.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/media/libstagefright/Android.mk b/media/libstagefright/Android.mk index 77a1476..404762f 100644 --- a/media/libstagefright/Android.mk +++ b/media/libstagefright/Android.mk @@ -81,6 +81,7 @@ LOCAL_STATIC_LIBRARIES := \ libstagefright_httplive \ libstagefright_rtsp \ libstagefright_id3 \ + libstagefright_g711dec \ LOCAL_SHARED_LIBRARIES += \ libstagefright_amrnb_common \ |