summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Merge "ISurfaceTexture does not have a method getIdentity()"James Dong2011-04-011-2/+1
|\
| * ISurfaceTexture does not have a method getIdentity()James Dong2011-04-011-2/+1
* | Merge "Remove legacy hack to only drop frames every other late frame"Andreas Huber2011-04-012-14/+6
|\ \
| * | Remove legacy hack to only drop frames every other late frameAndreas Huber2011-04-012-14/+6
| |/
* | Merge "Fix a webm-seek issue introduced when adding support for streaming webm"Andreas Huber2011-04-011-1/+4
|\ \
| * | Fix a webm-seek issue introduced when adding support for streaming webmAndreas Huber2011-04-011-1/+4
| |/
* | am 1c56976a: am 38f04c0f: am 11dd5ae9: Improve Javadoc for USB Manager and MT...Mike Lockwood2011-04-012-10/+31
|\ \ | |/ |/|
| * am 38f04c0f: am 11dd5ae9: Improve Javadoc for USB Manager and MTP/PTP support.Mike Lockwood2011-04-012-10/+31
| |\
| | * am 11dd5ae9: Improve Javadoc for USB Manager and MTP/PTP support.Mike Lockwood2011-04-012-10/+31
| | |\
| | | * Improve Javadoc for USB Manager and MTP/PTP support.Mike Lockwood2011-04-012-10/+31
* | | | am 69250839: am 4ed59de6: am ffa670b5: Bug 4167061Glenn Kasten2011-03-311-1/+1
|\ \ \ \ | |/ / /
| * | | am 4ed59de6: am ffa670b5: Bug 4167061Glenn Kasten2011-03-311-1/+1
| |\ \ \ | | |/ /
| | * | am ffa670b5: Bug 4167061Glenn Kasten2011-03-311-1/+1
| | |\ \ | | | |/
| | | * Bug 4167061Glenn Kasten2011-03-301-1/+1
* | | | am 399792b8: am 06ac0399: am b676b73e: Merge "When http streaming and Content...Andreas Huber2011-03-301-1/+8
|\ \ \ \ | |/ / /
| * | | am 06ac0399: am b676b73e: Merge "When http streaming and Content-Length is un...Andreas Huber2011-03-301-1/+8
| |\ \ \ | | |/ /
| | * | am b676b73e: Merge "When http streaming and Content-Length is unknown, make s...Andreas Huber2011-03-301-1/+8
| | |\ \ | | | |/
| | | * Merge "When http streaming and Content-Length is unknown, make sure to return...Andreas Huber2011-03-301-1/+8
| | | |\
| | | | * When http streaming and Content-Length is unknown, make sure to return allAndreas Huber2011-03-301-1/+8
* | | | | am 66ec9068: am 8de5df43: am ebf6a72b: Merge "Surfaceflinger expects rectangl...Andreas Huber2011-03-302-4/+4
|\ \ \ \ \ | |/ / / /
| * | | | am 8de5df43: am ebf6a72b: Merge "Surfaceflinger expects rectangles to be spec...Andreas Huber2011-03-302-4/+4
| |\ \ \ \ | | |/ / /
| | * | | am ebf6a72b: Merge "Surfaceflinger expects rectangles to be specified right/b...Andreas Huber2011-03-302-4/+4
| | |\ \ \ | | | |/ /
| | | * | Surfaceflinger expects rectangles to be specified right/bottom edge exclusive.Andreas Huber2011-03-292-4/+4
| | | |/
* | | | am 0ddcc8bc: am b618b2ef: am f0dbf00d: Merge "Handle OutOfMemoryError when de...Brad Fitzpatrick2011-03-301-1/+3
|\ \ \ \ | |/ / /
| * | | am b618b2ef: am f0dbf00d: Merge "Handle OutOfMemoryError when decoding images...Brad Fitzpatrick2011-03-301-1/+3
| |\ \ \ | | |/ / | |/| |
| | * | am f0dbf00d: Merge "Handle OutOfMemoryError when decoding images in Thumbnail...Brad Fitzpatrick2011-03-281-1/+3
| | |\ \
| | | * | Handle OutOfMemoryError when decoding images in ThumbnailUtilsChrister Fletcher2011-03-281-1/+3
* | | | | Support for divx files, i.e. mpeg 4 video + mpeg audio layer III in .avi filesAndreas Huber2011-03-308-1/+1044
* | | | | Merge "Stagefright DataSources now expose the underlying content mime type."Andreas Huber2011-03-309-19/+75
|\ \ \ \ \
| * | | | | Stagefright DataSources now expose the underlying content mime type.Andreas Huber2011-03-309-19/+75
* | | | | | Check whether WAVE extractor can be initialized successfully in the sniffer f...James Dong2011-03-301-0/+5
|/ / / / /
* | | | | Merge "Fix missing cross-ref links in the MediaPlayer.java javadoc"James Dong2011-03-291-0/+4
|\ \ \ \ \
| * | | | | Fix missing cross-ref links in the MediaPlayer.java javadocJames Dong2011-03-291-0/+4
* | | | | | Merge "Fix media scanner uri handling."Marco Nelissen2011-03-291-21/+13
|\ \ \ \ \ \
| * | | | | | Fix media scanner uri handling.Marco Nelissen2011-03-291-21/+13
* | | | | | | Merge "Add a user-agent header to our RTSP requests."Andreas Huber2011-03-292-0/+33
|\ \ \ \ \ \ \
| * | | | | | | Add a user-agent header to our RTSP requests.Andreas Huber2011-03-292-0/+33
| | |/ / / / / | |/| | | | |
* | | | | | | Merge "Adding support for the '.mxmf' MIDI file extension."Andreas Huber2011-03-292-2/+4
|\ \ \ \ \ \ \
| * | | | | | | Adding support for the '.mxmf' MIDI file extension.Andreas Huber2011-03-292-2/+4
| |/ / / / / /
* | | | | | | Make sure we don't trigger a log warning if calling ALooper::stop() from the ...Andreas Huber2011-03-291-2/+21
|/ / / / / /
* | | | | | Merge "frameworks/base: some camera-interface cleanup"Iliyan Malchev2011-03-281-22/+0
|\ \ \ \ \ \
| * | | | | | frameworks/base: some camera-interface cleanupIliyan Malchev2011-03-281-22/+0
| |/ / / / /
* | | | | | Ignore OMX codec messages once we're in ERROR state.Andreas Huber2011-03-282-1/+6
|/ / / / /
* | | | | am a4a81aef: am e7cedad2: am 2edbdcc6: Merge "After a seek there\'s a brief p...Andreas Huber2011-03-281-0/+5
|\ \ \ \ \ | |/ / / /
| * | | | am 2edbdcc6: Merge "After a seek there\'s a brief period where audio time isn...Andreas Huber2011-03-281-0/+5
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge "After a seek there's a brief period where audio time isn't reestablish...Andreas Huber2011-03-281-0/+5
| | |\ \ \
| | | * | | After a seek there's a brief period where audio time isn't reestablished.Andreas Huber2011-03-251-0/+5
* | | | | | Merge "merge libsurfaceflinger_client into libgui"Mathias Agopian2011-03-255-6/+4
|\ \ \ \ \ \
| * | | | | | merge libsurfaceflinger_client into libguiMathias Agopian2011-03-255-6/+4
* | | | | | | am e2cb08bd: am 2fee96bc: am 1457ef74: Merge "Make sure we post a video event...Andreas Huber2011-03-251-2/+17
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / /