summaryrefslogtreecommitdiffstats
path: root/media/libstagefright
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2010-08-30 16:12:46 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-08-30 16:12:46 -0700
commit68ae91cbd20939e48ad15c15405048e7ff9fe2f8 (patch)
treed9d6f9d6b62ccb38be23d2b95305cf23c3e6709a /media/libstagefright
parentabb8398e5ab40a3078902c5333126a0743ba2458 (diff)
parent0ddf8c09f9610bf0a810c7852681738741802cb9 (diff)
downloadframeworks_base-68ae91cbd20939e48ad15c15405048e7ff9fe2f8.zip
frameworks_base-68ae91cbd20939e48ad15c15405048e7ff9fe2f8.tar.gz
frameworks_base-68ae91cbd20939e48ad15c15405048e7ff9fe2f8.tar.bz2
Merge "Recent changes to the rtsp code require every buffer fed to the packet source to have a timestamp, we're ignoring timestamps for gtalk videochat but we still have to have a placeholder." into gingerbread
Diffstat (limited to 'media/libstagefright')
-rw-r--r--media/libstagefright/rtsp/ARTPSession.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/media/libstagefright/rtsp/ARTPSession.cpp b/media/libstagefright/rtsp/ARTPSession.cpp
index d2c56f7..f60c1a9 100644
--- a/media/libstagefright/rtsp/ARTPSession.cpp
+++ b/media/libstagefright/rtsp/ARTPSession.cpp
@@ -167,6 +167,7 @@ void ARTPSession::onMessageReceived(const sp<AMessage> &msg) {
#endif
accessUnit->meta()->setInt64("ntp-time", ntpTime);
+ accessUnit->meta()->setInt64("timeUs", 0);
#if 0
int32_t damaged;