summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
...
| * | avcenc: Initialize all memory allocated by the CBAVC_Malloc callback functionMartin Storsjo2012-07-122-2/+5
* | | Merge "avcenc: Remove useless casts"Jean-Baptiste Queru2012-08-081-2/+2
|\ \ \
| * | | avcenc: Remove useless castsMartin Storsjo2012-07-101-2/+2
| |/ /
* | | Merge "avcenc: Fix indentation"Jean-Baptiste Queru2012-08-081-2/+2
|\ \ \
| * | | avcenc: Fix indentationMartin Storsjo2012-07-101-2/+2
| | |/ | |/|
* | | Merge "avcenc: Switch malloc/free callbacks to use pointers instead of ints"Jean-Baptiste Queru2012-08-087-35/+35
|\ \ \ | | |/ | |/|
| * | avcenc: Switch malloc/free callbacks to use pointers instead of intsMartin Storsjo2012-07-107-35/+35
| |/
* | mediacodec: Return an error on getOutputFormat if there is no output format yetMartin Storsjo2012-07-131-1/+2
|/
* am 33e28dd3: Merge "SurfaceMediaSource: keep refs to current buffers" into jb...Jamie Gennis2012-06-221-48/+52
|\
| * Merge "SurfaceMediaSource: keep refs to current buffers" into jb-devJamie Gennis2012-06-221-48/+52
| |\
| | * SurfaceMediaSource: keep refs to current buffersJamie Gennis2012-06-221-48/+52
* | | am 39a31135: Revert input buffer count for the SoftAAC* decoders back to 4.Andreas Huber2012-06-202-2/+2
|\ \ \ | |/ /
| * | Revert input buffer count for the SoftAAC* decoders back to 4.Andreas Huber2012-06-202-2/+2
| |/
* | am fc42e16d: Merge "Fix track selection code in AwesomePlayer" into jb-devJames Dong2012-06-151-1/+1
|\ \ | |/
| * Fix track selection code in AwesomePlayerInsun Kang2012-06-151-1/+1
* | am 7b4de101: Merge "stagefright: set scaling mode for blank frames" into jb-devJamie Gennis2012-06-141-0/+8
|\ \ | |/
| * Merge "stagefright: set scaling mode for blank frames" into jb-devJamie Gennis2012-06-141-0/+8
| |\
| | * stagefright: set scaling mode for blank framesJamie Gennis2012-06-141-0/+8
* | | am 192cbbad: Fix audio track pause.Eric Laurent2012-06-141-0/+1
|\ \ \ | |/ /
| * | Fix audio track pause.Eric Laurent2012-06-141-0/+1
| |/
* | am 82233b4b: Merge "Better handle invalid duration in Xing/VBRI tags" into jb...Marco Nelissen2012-06-142-7/+16
|\ \ | |/
| * Merge "Better handle invalid duration in Xing/VBRI tags" into jb-devMarco Nelissen2012-06-142-7/+16
| |\
| | * Better handle invalid duration in Xing/VBRI tagsMarco Nelissen2012-06-132-7/+16
* | | am 49dd5cf3: Merge "Log track name on obtain/releaseBuffer warnings" into jb-devGlenn Kasten2012-06-141-3/+3
|\ \ \ | |/ /
| * | Merge "Log track name on obtain/releaseBuffer warnings" into jb-devGlenn Kasten2012-06-141-3/+3
| |\ \
| | * | Log track name on obtain/releaseBuffer warningsGlenn Kasten2012-06-131-3/+3
| | |/
* | | am e20435de: Merge "Add NOTICE and MODULE_LICENSE_APACH2 to libs build under ...James Dong2012-06-1388-0/+8360
|\ \ \ | |/ /
| * | Merge "Add NOTICE and MODULE_LICENSE_APACH2 to libs build under /frameworks/a...James Dong2012-06-1388-0/+8360
| |\ \
| | * | Add NOTICE and MODULE_LICENSE_APACH2 to libs build under /frameworks/av/James Dong2012-06-1388-0/+8360
| | |/
* | | am cac467b3: Merge "Fix one of the potential ANR issues from AwesomePlayer" i...James Dong2012-06-131-1/+7
|\ \ \ | |/ /
| * | Merge "Fix one of the potential ANR issues from AwesomePlayer" into jb-devJames Dong2012-06-131-1/+7
| |\ \ | | |/ | |/|
| | * Fix one of the potential ANR issues from AwesomePlayerJames Dong2012-06-121-1/+7
* | | am b4ea1ab8: Merge "stagefright: fix AudioRecord callback buffer size" into j...Eric Laurent2012-06-121-13/+33
|\ \ \ | |/ /
| * | Merge "stagefright: fix AudioRecord callback buffer size" into jb-devEric Laurent2012-06-121-13/+33
| |\ \ | | |/ | |/|
| | * stagefright: fix AudioRecord callback buffer sizeEric Laurent2012-06-121-13/+33
* | | am 958f463c: Add NOTICE and MODULE_LICENSE_APACHE2 for libstagefright_soft_h2...James Dong2012-06-124-0/+380
|\ \ \ | |/ /
| * | Add NOTICE and MODULE_LICENSE_APACHE2 for libstagefright_soft_h264dec and lib...James Dong2012-06-124-0/+380
| |/
* | am 10cf121f: Merge "Update make file" into jb-devDave Burke2012-06-122-4/+2
|\ \ | |/
| * Merge "Update make file" into jb-devDave Burke2012-06-122-4/+2
| |\
| | * Update make fileDave Burke2012-06-122-4/+2
* | | am b7706712: Merge "Fix gapless for deep buffers" into jb-devMarco Nelissen2012-06-121-0/+1
|\ \ \ | |/ /
| * | Merge "Fix gapless for deep buffers" into jb-devMarco Nelissen2012-06-121-0/+1
| |\ \
| | * | Fix gapless for deep buffersMarco Nelissen2012-06-111-0/+1
* | | | am 58c8db6b: Merge "Fix gapless playback" into jb-devMarco Nelissen2012-06-121-38/+47
|\ \ \ \ | |/ / /
| * | | Merge "Fix gapless playback" into jb-devMarco Nelissen2012-06-111-38/+47
| |\ \ \ | | |/ / | | | / | | |/ | |/|
| | * Fix gapless playbackMarco Nelissen2012-06-111-38/+47
* | | am 8a61dc02: Merge "Revert "Added some informational log messages to track do...James Dong2012-06-121-3/+2
|\ \ \ | |/ /
| * | Revert "Added some informational log messages to track down ANR related issues"James Dong2012-06-111-3/+2
| |/
* | stagefright aacenc: Move system headers before local headersMartin Storsjo2012-06-111-1/+4
* | stagefright aacenc: Add parentheses in expression with mixed && and ||Martin Storsjo2012-06-081-2/+2