diff options
| -rw-r--r-- | media/libstagefright/HTTPDataSource.cpp | 2 | ||||
| -rw-r--r-- | media/libstagefright/MediaPlayerImpl.cpp | 2 | ||||
| -rw-r--r-- | media/libstagefright/ShoutcastSource.cpp | 2 | ||||
| -rw-r--r-- | media/libstagefright/include/HTTPStream.h | 2 | ||||
| -rw-r--r-- | media/libstagefright/include/stagefright_string.h (renamed from media/libstagefright/include/string.h) | 0 | ||||
| -rw-r--r-- | media/libstagefright/string.cpp | 2 |
6 files changed, 5 insertions, 5 deletions
diff --git a/media/libstagefright/HTTPDataSource.cpp b/media/libstagefright/HTTPDataSource.cpp index fa92024..cc25886 100644 --- a/media/libstagefright/HTTPDataSource.cpp +++ b/media/libstagefright/HTTPDataSource.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "include/string.h" +#include "include/stagefright_string.h" #include "include/HTTPStream.h" #include <stdlib.h> diff --git a/media/libstagefright/MediaPlayerImpl.cpp b/media/libstagefright/MediaPlayerImpl.cpp index 3747a8d..4e0e996 100644 --- a/media/libstagefright/MediaPlayerImpl.cpp +++ b/media/libstagefright/MediaPlayerImpl.cpp @@ -18,7 +18,7 @@ #define LOG_TAG "MediaPlayerImpl" #include "utils/Log.h" -#include "include/string.h" +#include "include/stagefright_string.h" #include "include/HTTPStream.h" #include <OMX_Component.h> diff --git a/media/libstagefright/ShoutcastSource.cpp b/media/libstagefright/ShoutcastSource.cpp index d420e6b..ec25430 100644 --- a/media/libstagefright/ShoutcastSource.cpp +++ b/media/libstagefright/ShoutcastSource.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "include/string.h" +#include "include/stagefright_string.h" #include "include/HTTPStream.h" #include <stdlib.h> diff --git a/media/libstagefright/include/HTTPStream.h b/media/libstagefright/include/HTTPStream.h index e05d911..43ef614 100644 --- a/media/libstagefright/include/HTTPStream.h +++ b/media/libstagefright/include/HTTPStream.h @@ -18,7 +18,7 @@ #define HTTP_STREAM_H_ -#include "string.h" +#include "stagefright_string.h" #include <sys/types.h> diff --git a/media/libstagefright/include/string.h b/media/libstagefright/include/stagefright_string.h index 5dc7116..5dc7116 100644 --- a/media/libstagefright/include/string.h +++ b/media/libstagefright/include/stagefright_string.h diff --git a/media/libstagefright/string.cpp b/media/libstagefright/string.cpp index a4a1937..bd6204b 100644 --- a/media/libstagefright/string.cpp +++ b/media/libstagefright/string.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "include/string.h" +#include "include/stagefright_string.h" namespace android { |