summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | am 4ee5d2b9: Merge "LiveSession: Use the actual, possibly redirected url as b...Marco Nelissen2014-02-202-4/+13
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | * | | | | | Merge "LiveSession: Use the actual, possibly redirected url as base in the M3U"Marco Nelissen2014-02-202-4/+13
| | |\ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | | * | | | | LiveSession: Use the actual, possibly redirected url as base in the M3UMartin Storsjo2014-01-102-4/+13
* | | | | | | | Merge "fix codec buffer leak in error handling when timestamp goes backward"Chong Zhang2014-02-191-7/+7
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | fix codec buffer leak in error handling when timestamp goes backwardChong Zhang2014-02-141-7/+7
* | | | | | | | Merge "Handle recording failure more gracefully."Ruben Brunk2014-02-191-8/+19
|\ \ \ \ \ \ \ \
| * | | | | | | | Handle recording failure more gracefully.Ruben Brunk2014-02-181-8/+19
* | | | | | | | | Expand support for fragmented mp4Marco Nelissen2014-02-191-12/+27
* | | | | | | | | Merge "Fix crash when seeking fragmented mp4 files"Marco Nelissen2014-02-191-10/+17
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | Fix crash when seeking fragmented mp4 filesMarco Nelissen2014-02-181-10/+17
* | | | | | | | | Merge "Simplify and remove old comment"Glenn Kasten2014-02-181-3/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Simplify and remove old commentGlenn Kasten2014-02-181-3/+1
* | | | | | | | | | Multi-client recordingGlenn Kasten2014-02-181-1/+3
|/ / / / / / / / /
* | | | | | | | | Merge "Move StateQueueInstantiations to libinstantssq"Glenn Kasten2014-02-182-10/+19
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Move StateQueueInstantiations to libinstantssqGlenn Kasten2014-02-182-10/+19
* | | | | | | | | | Merge "Fix bug with not reporting lost bytes"Glenn Kasten2014-02-181-2/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Fix bug with not reporting lost bytesGlenn Kasten2014-02-181-2/+2
* | | | | | | | | | Merge "Add private method NBLog::Reader::dumpLine()"Glenn Kasten2014-02-181-37/+43
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Add private method NBLog::Reader::dumpLine()Glenn Kasten2014-02-181-37/+43
* | | | | | | | | | Merge "Fix warning due to incorrect log format"Glenn Kasten2014-02-181-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Fix warning due to incorrect log formatGlenn Kasten2014-02-181-1/+1
| |/ / / / / / / /
* | | | | | | | | Merge "Skip scaling_list definitions in AVC seq header."Andreas Huber2014-02-181-1/+37
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Skip scaling_list definitions in AVC seq header.Andreas Huber2014-02-141-1/+37
* | | | | | | | | Merge "LiveSession: Add support for block-by-block fetchFile."Robert Shih2014-02-152-35/+80
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | LiveSession: Add support for block-by-block fetchFile.Robert Shih2014-02-132-35/+80
* | | | | | | | | | Merge "PlaylistFetcher: Add support for block-by-block decryption."Robert Shih2014-02-152-37/+75
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | PlaylistFetcher: Add support for block-by-block decryption.Robert Shih2014-02-132-37/+75
| |/ / / / / / / / /
* | | | | | | | | | Merge "AnotherPacketSource support to get latest buffered MetaData."Robert Shih2014-02-152-2/+25
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | AnotherPacketSource support to get latest buffered MetaData.Robert Shih2014-02-032-2/+25
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | Merge "Try not to have sample durations vary too much"Marco Nelissen2014-02-141-0/+16
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | Try not to have sample durations vary too muchMarco Nelissen2014-02-131-0/+16
* | | | | | | | | | am 8dad284a: am 80b72e6f: Merge "libeffects: don\'t set module path"Colin Cross2014-02-141-1/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | |
| * | | | | | | | | am 80b72e6f: Merge "libeffects: don\'t set module path"Colin Cross2014-02-141-1/+0
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | |
| | * | | | | | | | libeffects: don't set module pathColin Cross2014-02-131-1/+0
| * | | | | | | | | am af191eb4: Merge "Replace size_t in shared memory by uint32_t"Glenn Kasten2014-02-131-6/+13
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Replace size_t in shared memory by uint32_tGlenn Kasten2014-02-131-6/+13
* | | | | | | | | | Merge "Track pid for each session"Marco Nelissen2014-02-137-27/+49
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Track pid for each sessionMarco Nelissen2014-02-117-27/+49
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Remove unused FragmentedMP4Parser and friends. The functionality has beenAndreas Huber2014-02-139-2986/+1
| |_|_|_|_|/ / / / |/| | | | | | | |
* | | | | | | | | am 49960807: am 0105027f: Fix wrong channel table in ESQueue according to the...Dongwon Kang2014-02-131-1/+1
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | am 0105027f: Fix wrong channel table in ESQueue according to the A/52 table 5.8Dongwon Kang2014-02-131-1/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix wrong channel table in ESQueue according to the A/52 table 5.8Dongwon Kang2014-02-111-1/+1
* | | | | | | | | | Merge "Even more warnings (now errors) fixed to unbreak the sdk-x86 build(s)."Andreas Huber2014-02-124-3/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Even more warnings (now errors) fixed to unbreak the sdk-x86 build(s).Andreas Huber2014-02-124-3/+6
* | | | | | | | | | | Merge "Fix warnings (now errors) in YUVImage.cpp"Andreas Huber2014-02-121-6/+6
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix warnings (now errors) in YUVImage.cppAndreas Huber2014-02-121-6/+6
| |/ / / / / / / / / /
* | | | | | | | | | | Merge "Increased recorded MP4 max file size to 4GB (more precisely 2^32-1 byt...Rachad2014-02-121-3/+5
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Increased recorded MP4 max file size to 4GBRachad2014-02-101-3/+5
* | | | | | | | | | | | Merge "fix the OS X builds until we can fix compiler warnings that apparently"Andreas Huber2014-02-125-9/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | fix the OS X builds until we can fix compiler warnings that apparentlyAndreas Huber2014-02-115-9/+1
| | |/ / / / / / / / / / | |/| | | | | | | | | |