summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 8eef093c: Merge "libstagefright: Use LOG_BASIC when use chromium http stack"Jean-Baptiste Queru2013-07-081-1/+1
|\
| * Merge "libstagefright: Use LOG_BASIC when use chromium http stack"Jean-Baptiste Queru2013-07-081-1/+1
| |\
| | * libstagefright: Use LOG_BASIC when use chromium http stackXuefeng Deng2012-08-171-1/+1
* | | am 267363ee: Merge "Prevent Media Server crash while the AwesomePlayer getBit...Jean-Baptiste Queru2013-07-081-1/+1
|\ \ \ | |/ /
| * | Merge "Prevent Media Server crash while the AwesomePlayer getBitrate return t...Jean-Baptiste Queru2013-07-081-1/+1
| |\ \
| | * | Prevent Media Server crash while the AwesomePlayer getBitrate return true wit...hovanchen2013-07-031-1/+1
* | | | am ca7f1609: Merge "Prevent double disconnects in RTSPSource"Jean-Baptiste Queru2013-07-081-0/+4
|\ \ \ \ | |/ / /
| * | | Merge "Prevent double disconnects in RTSPSource"Jean-Baptiste Queru2013-07-081-0/+4
| |\ \ \ | | |/ / | |/| |
| | * | Prevent double disconnects in RTSPSourceFredrik Rosin2013-07-011-0/+4
| |/ /
* | | am a9aa6baa: Merge "Set u.ext_data to null after it has been freed"Andreas Huber2013-06-281-0/+1
|\ \ \ | |/ /
| * | Merge "Set u.ext_data to null after it has been freed"Andreas Huber2013-06-281-0/+1
| |\ \
| | * | Set u.ext_data to null after it has been freedChrister Fletcher2013-06-281-0/+1
* | | | am bdf33c98: Merge "Fix compilation warning: incorrect format specifier for t...Glenn Kasten2013-06-281-1/+1
|\ \ \ \ | |/ / /
| * | | Merge "Fix compilation warning: incorrect format specifier for type 'ssize_t'."Glenn Kasten2013-06-281-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | Fix compilation warning: incorrect format specifier for type 'ssize_t'.Scott Fan2013-06-271-1/+1
| |/ /
* | | am d74a9ee8: Merge "libstagefright: fix the duration "00:00" for some httpliv...Jean-Baptiste Queru2013-06-250-0/+0
|\ \ \ | |/ /
| * | Merge "libstagefright: fix the duration "00:00" for some httplive link"Jean-Baptiste Queru2013-06-251-3/+0
| |\ \
| | * | libstagefright: fix the duration "00:00" for some httplive linkywan1712012-08-241-3/+0
* | | | am 60f3f102: Merge "Prevent AudioCommands being freed before read"Glenn Kasten2013-06-201-6/+8
|\ \ \ \ | |/ / /
| * | | Merge "Prevent AudioCommands being freed before read"Glenn Kasten2013-06-201-6/+8
| |\ \ \
| | * | | Prevent AudioCommands being freed before readChrister Fletcher2013-06-201-6/+8
* | | | | am d5018116: Merge "Fix typo."Glenn Kasten2013-06-141-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Fix typo."Glenn Kasten2013-06-141-1/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fix typo.Masaki Muranaka2013-06-061-1/+1
* | | | | am 132bc5bd: Merge "Noise will be heard if audio sample rate not matched with...Glenn Kasten2013-06-070-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Noise will be heard if audio sample rate not matched with audio track"Glenn Kasten2013-06-071-1/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Noise will be heard if audio sample rate not matched with audio trackMing Zhou2013-06-071-1/+1
| |/ / /
* | | | am 25b5617c: Merge "stagefright: Fix port-reconfiguration & output-buffer-fil...Lajos Molnar2013-06-031-6/+4
|\ \ \ \
| * \ \ \ Merge "stagefright: Fix port-reconfiguration & output-buffer-filled race cond...Lajos Molnar2013-06-031-6/+4
| |\ \ \ \
| | * | | | stagefright: Fix port-reconfiguration & output-buffer-filled race conditionLajos Molnar2013-05-311-6/+4
* | | | | | am b7319a7e: Update HTTP proxy configuration for all media playback inside st...Andreas Huber2013-06-0316-2/+172
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Update HTTP proxy configuration for all media playback inside stagefright.Andreas Huber2013-05-3116-2/+172
| |/ / / /
* | | | | Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-05-300-0/+0
|\ \ \ \ \
| * \ \ \ \ merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-05-300-0/+0
| |\ \ \ \ \ | | |/ / / / | |/| | | |
* | | | | | am 41688da2: Merge "MediaMuxer: Remove SAMPLE_FLAG_SYNC flag" into jb-mr2-devLajos Molnar2013-05-292-7/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "MediaMuxer: Remove SAMPLE_FLAG_SYNC flag" into jb-mr2-devLajos Molnar2013-05-292-7/+1
| |\ \ \ \ \
| | * | | | | MediaMuxer: Remove SAMPLE_FLAG_SYNC flagLajos Molnar2013-05-282-7/+1
* | | | | | | Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-05-290-0/+0
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-05-290-0/+0
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
* | | | | | | am 3c89a2e9: Merge "camera3: Don\'t try to disconnect stream native windows m...Igor Murashkin2013-05-284-2/+15
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "camera3: Don't try to disconnect stream native windows more than once"...Igor Murashkin2013-05-284-2/+15
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | camera3: Don't try to disconnect stream native windows more than onceIgor Murashkin2013-05-284-2/+15
* | | | | | | Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-05-280-0/+0
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-05-260-0/+0
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
* | | | | | | Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-05-240-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Camera3: Fix the deadlock during recording pinch zoomingZhijun He2013-05-242-3/+15
| * | | | | | camera3: Disable ZSL for limited mode camera HALsIgor Murashkin2013-05-231-5/+13
| * | | | | | camera3: Fix zsl buffers released-while-in-use race conditionIgor Murashkin2013-05-232-12/+20
* | | | | | | am 6f6b31da: Merge "Camera3: Fix the deadlock during recording pinch zooming"...Zhijun He2013-05-242-3/+15
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge "Camera3: Fix the deadlock during recording pinch zooming" into jb-mr2-devZhijun He2013-05-242-3/+15
| |\ \ \ \ \ \