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 | 52b235b152ac1bbaf7f80402020d4ee7f5881f93 (patch) | |
| tree | 067764d63bcc908c546f8302083ce36e5b2e3930 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | a53289ba6bfcd2d415c6bc77aaa29819e167537e (diff) | |
| parent | 627020958b96f8610e9258d9e2a03f660c12242d (diff) | |
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 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions