Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 03e83d4a authored by Andreas Huber's avatar Andreas Huber Committed by Android Git Automerger
Browse files

am 68ae91cb: Merge "Recent changes to the rtsp code require every buffer fed... 

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 '68ae91cb' into gingerbread-plus-aosp

* commit '68ae91cb':
  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.
parents 987556bc 68ae91cb

media/libstagefright/rtsp/ARTPSession.cpp

+1 −0
Original line number Diff line number Diff line
@@ -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;