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 | d08d99733798a15ad6e8bb166a5ec89ce499af23 (patch) | |
| tree | 3da1d8d0a16d08bae8a68c1b9a23cd5a4a40992c /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | c2f33965d52e141097fe84a375badf9f49734696 (diff) | |
| parent | 52b235b152ac1bbaf7f80402020d4ee7f5881f93 (diff) | |
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 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions