diff options
| author | Andreas Huber <andih@google.com> | 2010-08-30 16:19:55 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-30 16:19:55 -0700 |
| commit | 47416bc4f9beb4147b29bb9d93653a4aa356c37d (patch) | |
| tree | fa3a4b434ab5ed7d63b0c2fab1a5ca4d6a8e7980 /media/libstagefright | |
| parent | 69245638682dfb310651e37a340153bf7ad52ac0 (diff) | |
| parent | 03e83d4ad909f5c07fb2011e03348a413453e909 (diff) | |
| download | frameworks_base-47416bc4f9beb4147b29bb9d93653a4aa356c37d.zip frameworks_base-47416bc4f9beb4147b29bb9d93653a4aa356c37d.tar.gz frameworks_base-47416bc4f9beb4147b29bb9d93653a4aa356c37d.tar.bz2 | |
am 03e83d4a: am 68ae91cb: 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
Merge commit '03e83d4ad909f5c07fb2011e03348a413453e909'
* commit '03e83d4ad909f5c07fb2011e03348a413453e909':
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.
Diffstat (limited to 'media/libstagefright')
| -rw-r--r-- | media/libstagefright/rtsp/ARTPSession.cpp | 1 |
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; |