summaryrefslogtreecommitdiffstats
path: root/media/libstagefright
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-08-24 07:29:45 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-08-24 07:29:45 -0700
commita8d21ea6dd37683a11a7ba2a63ab0af786ef52d7 (patch)
tree0c46f5322f4553357481c91d7171ba1c05c117d6 /media/libstagefright
parentd8d4d666cc323d6a30d2030f7a41f5778b9bbbd5 (diff)
parent780159840d754eae8e4e3f693ea10932634053f8 (diff)
downloadframeworks_av-a8d21ea6dd37683a11a7ba2a63ab0af786ef52d7.zip
frameworks_av-a8d21ea6dd37683a11a7ba2a63ab0af786ef52d7.tar.gz
frameworks_av-a8d21ea6dd37683a11a7ba2a63ab0af786ef52d7.tar.bz2
am 78015984: am 6e55a0f7: Merge "Fixed member access into incomplete type build error"
* commit '780159840d754eae8e4e3f693ea10932634053f8': Fixed member access into incomplete type build error
Diffstat (limited to 'media/libstagefright')
-rw-r--r--media/libstagefright/rtsp/ARTPConnection.cpp1
1 files changed, 1 insertions, 0 deletions
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"