diff options
| author | Andreas Huber <andih@google.com> | 2010-10-13 14:22:57 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-13 14:22:57 -0700 |
| commit | 217c81ec709f657bc2817b2083e400946b13e9d8 (patch) | |
| tree | 3658ee951c88875f235c8094508894fe85c5b26c /media/libmedia | |
| parent | e4edd632d48720b44f7878273f46d192d5703150 (diff) | |
| parent | f61551f4fc79e7da879802e3974afa9b03ffb5d0 (diff) | |
| download | frameworks_av-217c81ec709f657bc2817b2083e400946b13e9d8.zip frameworks_av-217c81ec709f657bc2817b2083e400946b13e9d8.tar.gz frameworks_av-217c81ec709f657bc2817b2083e400946b13e9d8.tar.bz2 | |
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 '646e0d5ab342f414f556574f2d078bd6deb22ed3' into gingerbread-plus-aosp
* commit '646e0d5ab342f414f556574f2d078bd6deb22ed3':
Some webcams output rtp streams but never send any rtcp data in violation of
Diffstat (limited to 'media/libmedia')
0 files changed, 0 insertions, 0 deletions