summaryrefslogtreecommitdiff
path: root/libs/rs/rsScript.cpp
diff options
context:
space:
mode:
author Andreas Huber <andih@google.com> 2010-10-15 00:08:35 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-10-15 00:08:35 -0700
commitdc0728f6b5603de0ea5795d29c9765cc6512340d (patch)
tree3f1188eaa9513e2f710d504252e2945388decd73 /libs/rs/rsScript.cpp
parent9456714cfb9eb5ba4882fdcc922b787d77ed4da4 (diff)
parent8e4f3c76dd7f5596fa2fe10bdf008d4c02353160 (diff)
am 8e4f3c76: am 646e0d5a: Merge "Some webcams output rtp streams but never send any rtcp data in violation of the specs. Attempt to use fake timestamps to be able to play these..." into gingerbread
Merge commit '8e4f3c76dd7f5596fa2fe10bdf008d4c02353160' * commit '8e4f3c76dd7f5596fa2fe10bdf008d4c02353160': Some webcams output rtp streams but never send any rtcp data in violation of
Diffstat (limited to 'libs/rs/rsScript.cpp')
0 files changed, 0 insertions, 0 deletions