| commit | 4b60ac04a878eaf8344b56189509ccd6925855c2 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Thu Aug 23 12:42:48 2012 -0700 |
| committer | android code review <noreply-gerritcodereview@google.com> | Thu Aug 23 12:42:48 2012 -0700 |
| tree | 8a969706f792f58bd6449d3085d83ff9abcbd50f | |
| parent | 6e55a0f71eef07c6041077e6e9e7fad8c973a752 [diff] | |
| parent | cba4ed0039c8b8fac01b3193d19fc2364f934506 [diff] |
Merge "Fixed redefinition of 'i' with a different type error"
diff --git a/media/libstagefright/rtsp/ARTPConnection.cpp b/media/libstagefright/rtsp/ARTPConnection.cpp index 44988a3..501a970 100644 --- a/media/libstagefright/rtsp/ARTPConnection.cpp +++ b/media/libstagefright/rtsp/ARTPConnection.cpp
@@ -18,6 +18,7 @@ #define LOG_TAG "ARTPConnection" #include <utils/Log.h> +#include "ARTPAssembler.h" #include "ARTPConnection.h" #include "ARTPSource.h"