summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* am 2dfe8ea7: Merge changes Idc9808f7,If7bc8e5b into lmp-devDan Albert2014-08-091-0/+4
|\
| * Merge changes Idc9808f7,If7bc8e5b into lmp-devDan Albert2014-08-098-0/+33
| |\
| | * Fix the build after -Bsymbolic fix.Dan Albert2014-08-081-0/+4
| | * Fix PIC relocations for non-Bsymbolic buildsArd Biesheuvel2014-08-087-0/+29
* | | am e079c76c: Merge "Added Tunneled video playback support to ACodec" into lmp...Rachad2014-08-097-57/+207
|\ \ \ | |/ /
| * | Merge "Added Tunneled video playback support to ACodec" into lmp-devRachad2014-08-097-57/+207
| |\ \
| | * | Added Tunneled video playback support to ACodecRachad2014-08-087-57/+207
* | | | am 53a1e46e: Merge "stagefright: set crop rect in SoftwareRenderer" into lmp-devLajos Molnar2014-08-091-0/+11
|\ \ \ \ | |/ / /
| * | | Merge "stagefright: set crop rect in SoftwareRenderer" into lmp-devLajos Molnar2014-08-091-0/+11
| |\ \ \
| | * | | stagefright: set crop rect in SoftwareRendererLajos Molnar2014-08-081-0/+11
* | | | | am 5f244042: Merge "Fix WAVExtractor to output full audio frames only" into l...Lajos Molnar2014-08-091-0/+4
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Fix WAVExtractor to output full audio frames only" into lmp-devLajos Molnar2014-08-091-0/+4
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fix WAVExtractor to output full audio frames onlyAndy Hung2014-08-081-0/+4
* | | | | am f7999047: Merge "NuPlayer: getSelectedTrack" into lmp-devRobert Shih2014-08-094-0/+51
|\ \ \ \ \ | |/ / / /
| * | | | NuPlayer: getSelectedTrackRobert Shih2014-08-084-0/+51
| | |/ / | |/| |
* | | | am a912c194: Merge "some clean up of video size change notification" into lmp...Chong Zhang2014-08-087-97/+109
|\ \ \ \ | |/ / /
| * | | Merge "some clean up of video size change notification" into lmp-devChong Zhang2014-08-087-97/+109
| |\ \ \
| | * | | some clean up of video size change notificationChong Zhang2014-08-087-97/+109
| | * | | delay data source creation for GenericSource prepare timeChong Zhang2014-08-083-21/+80
| | * | | Revert "NuPlayer: don't feed decoder input data during flushing."Wei Jia2014-08-071-5/+5
* | | | | am ddabe554: Merge "AAC decoder: add support for controlling presentation par...Jean-Michel Trivi2014-08-082-5/+111
|\ \ \ \ \ | |/ / / /
| * | | | Merge "AAC decoder: add support for controlling presentation parameters" into...Jean-Michel Trivi2014-08-082-5/+111
| |\ \ \ \
| | * | | | AAC decoder: add support for controlling presentation parametersJean-Michel Trivi2014-08-082-5/+111
* | | | | | am 15ff76c9: Merge "libstagefright: foundation: Add syntactic sugar to the ca...Sasha Levitskiy2014-08-081-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | libstagefright: foundation: Add syntactic sugar to the cast.Sasha Levitskiy2014-08-081-1/+1
| | |_|/ / | |/| | |
* | | | | Resolved conflicts for merge of aed1d581 to lmp-dev-plus-aospDan Albert2014-08-083-25/+0
|\ \ \ \ \
| * \ \ \ \ am 5a192121: Merge "Revert "Fix build after side-stepping global -Bsymbolic.""Dan Albert2014-08-083-25/+0
| |\ \ \ \ \
| | * \ \ \ \ Merge "Revert "Fix build after side-stepping global -Bsymbolic.""Dan Albert2014-08-073-25/+0
| | |\ \ \ \ \
| | | * | | | | Revert "Fix build after side-stepping global -Bsymbolic."Dan Albert2014-08-083-25/+0
* | | | | | | | am 317bb916: Merge "Clarify and implement MediaCodec status codes" into lmp-devAndy Hung2014-08-082-42/+144
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Merge "Clarify and implement MediaCodec status codes" into lmp-devAndy Hung2014-08-072-42/+144
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| | * | | | | | Clarify and implement MediaCodec status codesAndy Hung2014-08-072-42/+144
* | | | | | | | am 4b599537: am 9ee1572f: Merge "Fix PIC relocations for non-Bsymbolic builds"Dan Albert2014-08-087-0/+29
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | am 9ee1572f: Merge "Fix PIC relocations for non-Bsymbolic builds"Dan Albert2014-08-087-0/+29
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | Merge "Fix PIC relocations for non-Bsymbolic builds"Dan Albert2014-08-077-0/+29
| | |\ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | | * | | | | Fix PIC relocations for non-Bsymbolic buildsArd Biesheuvel2014-08-087-0/+29
* | | | | | | | am 1198a339: libstagefright_foundation: fix buildColin Cross2014-08-081-1/+1
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | libstagefright_foundation: fix buildColin Cross2014-08-071-1/+1
* | | | | | | | am 0afbc2c3: Merge "delay data source creation for GenericSource prepare time...Chong Zhang2014-08-083-21/+80
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "delay data source creation for GenericSource prepare time" into lmp-devChong Zhang2014-08-073-21/+80
| |\ \ \ \ \ \ \
| | * | | | | | | delay data source creation for GenericSource prepare timeChong Zhang2014-08-073-21/+80
* | | | | | | | | am 229d2426: stagefright: support flexible YUV formatLajos Molnar2014-08-082-16/+95
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | stagefright: support flexible YUV formatLajos Molnar2014-08-072-16/+95
* | | | | | | | | am 1381d4b5: media/playerservice: add getCodecList() to MediaPlayerServiceLajos Molnar2014-08-084-1/+37
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | media/playerservice: add getCodecList() to MediaPlayerServiceLajos Molnar2014-08-074-1/+37
* | | | | | | | | am 60b1c0e7: stagefright: rework media codec list and infosLajos Molnar2014-08-086-260/+574
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | stagefright: rework media codec list and infosLajos Molnar2014-08-076-260/+574
* | | | | | | | | am 8accee4f: stagefright: add AString parceling, and equal/compareIgnoreCaseLajos Molnar2014-08-081-0/+24
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | stagefright: add AString parceling, and equal/compareIgnoreCaseLajos Molnar2014-08-071-0/+24
* | | | | | | | | Resolved conflicts for merge of 2af8711d to lmp-dev-plus-aospDan Albert2014-08-073-0/+25
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
generated by cgit v1.1 at 2025-01-27 08:43:31 +0000