summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "libvideoeditor: fix code bugs when enabling all-level debugging macros"James Dong2012-12-213-4/+4
|\
| * libvideoeditor: fix code bugs when enabling all-level debugging macrosbeanz2012-11-073-4/+4
* | 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
* | | Merge "libvideoeditor: fix cannot show some thumbnails in storyboard or no fr...James Dong2012-12-201-0/+6
|\ \ \
| * | | libvideoeditor: fix cannot show some thumbnails in storyboard or no frame dis...beanz2012-11-161-0/+6
* | | | Merge "Allow multichannel FLAC files"Glenn Kasten2012-12-201-17/+44
|\ \ \ \
| * | | | Allow multichannel FLAC filesPatrik2 Carlsson2012-11-161-17/+44
| |/ / /
* | | | 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
* | | | | 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
* | | | | | Merge "FileSource: FILE is not closed"Marco Nelissen2012-12-141-0/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | FileSource: FILE is not closedYou Kim2012-12-141-0/+4
|/ / / / /
* | | | | 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
| |/ / / /
* | | | | Merge "Memory leak solved in MPEG4Extractor::parseChunk for cover art"Andreas Huber2012-12-031-6/+3
|\ \ \ \ \
| * | | | | Memory leak solved in MPEG4Extractor::parseChunk for cover artJens Gulin2012-11-191-6/+4
| | |/ / / | |/| | |
* | | | | Merge "Initialize and copy mRotationAngle in VideoFrame"Andreas Huber2012-11-301-1/+3
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Initialize and copy mRotationAngle in VideoFrameChrister Fletcher2012-11-301-1/+3
* | | | | Merge "Bug fix for the MediaPlayer::prepare() api."Marco Nelissen2012-11-293-5/+7
|\ \ \ \ \
| * | | | | Bug fix for the MediaPlayer::prepare() api.Dylan Powers2012-11-273-5/+7
| |/ / / /
* | | | | Merge "Unsolicited server responses cause RTSP streaming to crash"Andreas Huber2012-11-291-0/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Unsolicited server responses cause RTSP streaming to crashLena Magnusson2012-11-291-0/+1
|/ / / /
* | | | Merge "Crash in android::MyHandler::parsePlayResponse"Andreas Huber2012-11-271-0/+4
|\ \ \ \
| * | | | Crash in android::MyHandler::parsePlayResponsePatric Frederiksen2012-11-271-0/+4
| |/ / /
* | | | Merge "Fix of uninitialized mIsDrm variable."Andreas Huber2012-11-271-1/+1
|\ \ \ \
| * | | | Fix of uninitialized mIsDrm variable.Henrik B Andersson2012-11-271-1/+1
| |/ / /
* | | | Merge "MediaCodec: Add a method for getting the component name"Andreas Huber2012-11-262-4/+44
|\ \ \ \
| * | | | MediaCodec: Add a method for getting the component nameMartin Storsjo2012-11-192-4/+44
| |/ / /
* | | | Merge "AudioTrack::dump null mCblk check test"Marco Nelissen2012-11-261-1/+1
|\ \ \ \
| * | | | AudioTrack::dump null mCblk check testZbigniew Mazur2012-11-231-1/+1
| |/ / /
* | | | Merge "Avoid memory leaks when handling metadata strings"Marco Nelissen2012-11-201-1/+1
|\ \ \ \
| * | | | Avoid memory leaks when handling metadata stringsDavid Williams2012-11-201-1/+1
|/ / / /
* | | | Merge "Handle large AVCC chunks"Andreas Huber2012-11-201-6/+4
|\ \ \ \
| * | | | Handle large AVCC chunksJan Olof Svensson2012-11-191-6/+4
| |/ / /
* | | | Merge "Changed parsing of trkn and disk from 8 bits to 16 bits"Marco Nelissen2012-11-201-5/+7
|\ \ \ \ | |_|/ / |/| | |
| * | | Changed parsing of trkn and disk from 8 bits to 16 bitsAndreas Lillvik2012-11-191-5/+7
| |/ /
* | | Merge "Add .mpga to acceptable file name extensions list."Marco Nelissen2012-11-161-1/+1
|\ \ \ | |/ / |/| |
| * | Add .mpga to acceptable file name extensions list.Jan Bjernler2012-11-161-1/+1
|/ /
* | am 78b012f5: Reconcile with jb-mr1-factory-release jb-mr1-release - do not mergeThe Android Open Source Project2012-11-060-0/+0
|\ \
| | \
| | \
| *-. \ Reconcile with jb-mr1-factory-release jb-mr1-release - do not mergeThe Android Open Source Project2012-11-060-0/+0
| |\ \ \
* | \ \ \ am 1c6833af: Ignore SIGPIPE during write() to broken pipeGlenn Kasten2012-11-061-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | Ignore SIGPIPE during write() to broken pipeGlenn Kasten2012-11-061-0/+1
* | | | | Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-11-020-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-11-010-0/+0
| |\ \ \ \ | | |/ / / | |/| | |
* | | | | am 96076964: Make video encoders\' bitrate mode (constant, variable, ...) con...Andreas Huber2012-11-013-6/+28
|\ \ \ \ \ | |/ / / /
| * | | | Make video encoders' bitrate mode (constant, variable, ...) configurableAndreas Huber2012-11-013-6/+28
* | | | | Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-11-010-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-310-0/+0
| |\ \ \ \ | | |/ / / | |/| | |