summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* New HLS implementation supporting independent stream sources, audio-only streamsAndreas Huber2013-05-3124-868/+2575
* Merge "wifi-display: fixes for PAUSE/PLAY state"Chong Zhang2013-05-311-3/+5
|\
| * wifi-display: fixes for PAUSE/PLAY stateChong Zhang2013-05-301-3/+5
* | Merge "Edit list uses timescale from movie header"Marco Nelissen2013-05-302-7/+11
|\ \
| * | Edit list uses timescale from movie headerMarco Nelissen2013-05-302-7/+11
* | | am 268f5ccf: (-s ours) Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-05-300-0/+0
|\ \ \
| * \ \ 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
| | |\ \ \
* | | \ \ \ Merge "libstagefright: Check for duration > 0 to avoid divide-by-zero exception"Vineeta Srivastava2013-05-301-1/+1
|\ \ \ \ \ \
| * | | | | | libstagefright: Check for duration > 0 to avoid divide-by-zero exceptionAjay Dudani2013-05-281-1/+1
* | | | | | | camera: Dont segfault when result lacks timestampAlex Ray2013-05-301-3/+2
| |_|_|_|_|/ |/| | | | |
* | | | | | camera3: Error on minimum buffer countAlex Ray2013-05-291-2/+7
* | | | | | am 1cd68527: am 41688da2: Merge "MediaMuxer: Remove SAMPLE_FLAG_SYNC flag" in...Lajos Molnar2013-05-292-7/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | 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
* | | | | | | Merge "Don't crash if no timescale was given"Marco Nelissen2013-05-291-0/+2
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Don't crash if no timescale was givenMarco Nelissen2013-05-291-0/+2
* | | | | | | Merge "Camera: static parameter default values"Alex Ray2013-05-291-43/+51
|\ \ \ \ \ \ \
| * | | | | | | Camera: static parameter default valuesAlex Ray2013-05-281-43/+51
* | | | | | | | Merge "libcameraservice: missing argument when logging"Alex Ray2013-05-291-1/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | / / / / / / | |/ / / / / / |/| | | | | |
| * | | | | | libcameraservice: missing argument when loggingAlex Ray2013-05-281-1/+2
* | | | | | | am 197d3e07: (-s ours) Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-05-290-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / /
| * | | | | 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 9f013a46: am 3c89a2e9: Merge "camera3: Don\'t try to disconnect stream nat...Igor Murashkin2013-05-284-2/+15
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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
* | | | | | am 30ca8004: (-s ours) Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-05-280-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | |
| * | | | 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
| | |\ \ \ | | | |/ / | | |/| |
* | | | | am dd6b47e6: (-s ours) Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-05-240-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 22a5ddb6: am 6f6b31da: Merge "Camera3: Fix the deadlock during recording p...Zhijun He2013-05-242-3/+15
|\ \ \ \ \ | |/ / / /
| * | | | 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
| | |\ \ \
| | | * | | Camera3: Fix the deadlock during recording pinch zoomingZhijun He2013-05-232-3/+15
* | | | | | am 14e585c8: am 6947f125: Merge "camera3: Disable ZSL for limited mode camera...Ed Heyl2013-05-241-5/+13
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 6947f125: Merge "camera3: Disable ZSL for limited mode camera HALs" into j...Ed Heyl2013-05-231-5/+13
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "camera3: Disable ZSL for limited mode camera HALs" into jb-mr2-devEd Heyl2013-05-241-5/+13
| | |\ \ \ \
| | | * | | | camera3: Disable ZSL for limited mode camera HALsIgor Murashkin2013-05-231-5/+13
* | | | | | | Merge "Add support for MPEG editlist gapless info"Marco Nelissen2013-05-231-0/+61
|\ \ \ \ \ \ \
| * | | | | | | Add support for MPEG editlist gapless infoMarco Nelissen2013-05-231-0/+61
* | | | | | | | stagefright: BufferProducer updatesLajos Molnar2013-05-235-44/+58
* | | | | | | | am 9b89c15d: am ca3fb120: Merge "camera3: Fix zsl buffers released-while-in-u...Igor Murashkin2013-05-232-12/+20
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | am ca3fb120: Merge "camera3: Fix zsl buffers released-while-in-use race condi...Igor Murashkin2013-05-232-12/+20
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
generated by cgit v1.1 at 2024-06-26 14:17:06 +0000