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

Skip to content
Commit 52b235b1 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 '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.
parents a53289ba 62702095
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment