diff options
| author | Andreas Huber <andih@google.com> | 2010-08-30 16:16:03 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-30 16:16:03 -0700 |
| commit | d81ef83a493a27887b795fdf9ece391155779914 (patch) | |
| tree | 26ba3ef03f8e63cb5ed1f984089c638323179f89 /media | |
| parent | f594c6449ec3eeac92cb983a3bb0e4ef4ccc3e19 (diff) | |
| parent | 5d5f5dfcc16756fe80a7c46cff0949fce9d54fe9 (diff) | |
| download | frameworks_av-d81ef83a493a27887b795fdf9ece391155779914.zip frameworks_av-d81ef83a493a27887b795fdf9ece391155779914.tar.gz frameworks_av-d81ef83a493a27887b795fdf9ece391155779914.tar.bz2 | |
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 '68ae91cbd20939e48ad15c15405048e7ff9fe2f8' into gingerbread-plus-aosp
* commit '68ae91cbd20939e48ad15c15405048e7ff9fe2f8':
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')
| -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; |