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 | 6dea6f4e71b53e421564d783c227cbe0a2469183 (patch) | |
| tree | 831d44d4450fd36e0f228e5dc2186899a78b52f0 | |
| parent | 8dc16c27e23dae5bdf65fd2a2ced97c2f645a633 (diff) | |
| parent | 16263d9f8cc01392c2f3678b381ce897647c8c81 (diff) | |
| download | frameworks_base-6dea6f4e71b53e421564d783c227cbe0a2469183.zip frameworks_base-6dea6f4e71b53e421564d783c227cbe0a2469183.tar.gz frameworks_base-6dea6f4e71b53e421564d783c227cbe0a2469183.tar.bz2 | |
am 16263d9f: Squashed commit of the following:
Merge commit '16263d9f8cc01392c2f3678b381ce897647c8c81' into gingerbread
* commit '16263d9f8cc01392c2f3678b381ce897647c8c81':
Squashed commit of the following:
| -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> |