summaryrefslogtreecommitdiffstats
path: root/media
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
|\ \ \ \ | |/ / /
| * | | 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
|\ \ \ \ | |/ / /
| * | | Fix compilation warning: incorrect format specifier for type 'ssize_t'.Scott Fan2013-06-271-1/+1
| |/ /
| * | 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 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
| * | | | Noise will be heard if audio sample rate not matched with audio trackMing Zhou2013-06-071-1/+1
| |/ / /
| * | | Merge "Fix overflow of rand in ARTPConnection"Andreas Huber2013-04-241-1/+2
| |\ \ \
| | * | | Fix overflow of rand in ARTPConnectionYajun Zeng2013-04-241-1/+2
| * | | | Merge "fix a race condition of MediaPlayerServce::Client::mClient"Andreas Huber2013-04-241-1/+1
| |\ \ \ \ | | |/ / / | |/| | |
| * | | | Fixed the wrong timestamps issue about camera recordingJun Tian2013-04-221-1/+1
| * | | | Fix for crash if no content in DESCRIBE responseXuefei Chen2013-03-121-0/+3
| * | | | Merge "Avoid invalid memory access when using extractMetadata()"Marco Nelissen2013-03-011-1/+16
| |\ \ \ \
| | * | | | Avoid invalid memory access when using extractMetadata()Sangkyu Lee2013-02-281-1/+16
| * | | | | Merge "SoftAMR: Signal the right frame format"Andreas Huber2013-02-271-1/+1
| |\ \ \ \ \
| | * | | | | SoftAMR: Signal the right frame formatMartin Storsjo2013-02-171-1/+1
| * | | | | | Merge "SoftVorbis: Set the right encoding in the port definition"Andreas Huber2013-02-271-1/+1
| |\ \ \ \ \ \
| | * | | | | | SoftVorbis: Set the right encoding in the port definitionMartin Storsjo2013-01-311-1/+1
| | | |/ / / / | | |/| | | |
| * | | | | | Merge "MPEG4Writer: Write a zero-length compressor string"Andreas Huber2013-02-271-1/+2
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | MPEG4Writer: Write a zero-length compressor stringMartin Storsjo2013-01-311-1/+2
| | |/ / / /
| * | | | | am b54cedab: Merge "Use default values when MPEG4 audio config parsing fails."James Dong2012-12-211-3/+10
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Use default values when MPEG4 audio config parsing fails."James Dong2012-12-201-3/+10
| | |\ \ \ \
| | | * | | | Use default values when MPEG4 audio config parsing fails.Erik Rydgren2012-11-191-3/+10
| * | | | | | am df9cce64: Merge "Allow multichannel FLAC files"Glenn Kasten2012-12-201-17/+44
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Allow multichannel FLAC files"Glenn Kasten2012-12-201-17/+44
| | |\ \ \ \ \
| | | * | | | | Allow multichannel FLAC filesPatrik2 Carlsson2012-11-161-17/+44
| * | | | | | | am f38259cf: Merge "Fix bug in WAVExtractor for 24-bit per sample wav"Glenn Kasten2012-12-171-2/+4
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "Fix bug in WAVExtractor for 24-bit per sample wav"Glenn Kasten2012-12-171-2/+4
| | |\ \ \ \ \ \
| | | * | | | | | Fix bug in WAVExtractor for 24-bit per sample wavcong.zhou2012-11-301-2/+4
| * | | | | | | | am 0cd75629: Merge "Match new paths and organization in external/libvpx"Jean-Baptiste Queru2012-12-143-5/+5
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge "Match new paths and organization in external/libvpx"Jean-Baptiste Queru2012-12-143-5/+5
| | |\ \ \ \ \ \ \
| | | * | | | | | | Match new paths and organization in external/libvpxJohann2012-12-123-5/+5
| * | | | | | | | | am 409542cd: Merge "FileSource: FILE is not closed"Marco Nelissen2012-12-141-0/+4
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | FileSource: FILE is not closedYou Kim2012-12-141-0/+4
| | |/ / / / / / /
| * | | | | | | | am 03425d9c: Merge "Fix bad checks that causes crash when streaming H.263 con...Andreas Huber2012-12-062-3/+28
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge "Fix bad checks that causes crash when streaming H.263 content."Andreas Huber2012-12-052-3/+28
| | |\ \ \ \ \ \ \
| | | * | | | | | | Fix bad checks that causes crash when streaming H.263 content.Roger1 Jonsson2012-12-032-3/+28
| | | |/ / / / / /
| * | | | | | | | am f00d40c7: Merge "Memory leak solved in MPEG4Extractor::parseChunk for cove...Andreas Huber2012-12-031-6/+3
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /