diff options
| author | Andreas Huber <andih@google.com> | 2010-07-29 11:07:49 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-29 11:07:49 -0700 |
| commit | 5caff27f4683d5e444f327a5beec15d9b8c7f252 (patch) | |
| tree | af12a11401e2ca3ab56b74032922ab1df8cdb835 /media | |
| parent | 60e182437228312cc28469a5b0dfde77ac848e1a (diff) | |
| parent | 3cc219dfc67b866e10828f0c17641668d47c1cd8 (diff) | |
| download | frameworks_av-5caff27f4683d5e444f327a5beec15d9b8c7f252.zip frameworks_av-5caff27f4683d5e444f327a5beec15d9b8c7f252.tar.gz frameworks_av-5caff27f4683d5e444f327a5beec15d9b8c7f252.tar.bz2 | |
am 16263d9f: Squashed commit of the following:
Merge commit '16263d9f8cc01392c2f3678b381ce897647c8c81' into gingerbread
* commit '16263d9f8cc01392c2f3678b381ce897647c8c81':
Squashed commit of the following:
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/AudioPlayer.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/media/libstagefright/AudioPlayer.cpp b/media/libstagefright/AudioPlayer.cpp index b7bde6b..c27cfc8 100644 --- a/media/libstagefright/AudioPlayer.cpp +++ b/media/libstagefright/AudioPlayer.cpp @@ -23,6 +23,7 @@ #include <media/stagefright/AudioPlayer.h> #include <media/stagefright/MediaDebug.h> #include <media/stagefright/MediaDefs.h> +#include <media/stagefright/MediaErrors.h> #include <media/stagefright/MediaSource.h> #include <media/stagefright/MetaData.h> |