summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* am 3ca352c4: am 24893fef: Merge "MPEG2TSWriter: Write a proper CRC in PAT and...Jean-Baptiste Queru2012-08-101-6/+37
|\
| * am 24893fef: Merge "MPEG2TSWriter: Write a proper CRC in PAT and PMT"Jean-Baptiste Queru2012-08-101-6/+37
| |\
| | * Merge "MPEG2TSWriter: Write a proper CRC in PAT and PMT"Jean-Baptiste Queru2012-08-101-6/+37
| | |\
| | | * MPEG2TSWriter: Write a proper CRC in PAT and PMTPaul Fariello2012-07-101-6/+37
* | | | am 31a593b9: am 2001d2ac: Merge "MPEG2TSWriter: Write proper continuity count...Jean-Baptiste Queru2012-08-101-7/+17
|\ \ \ \ | |/ / /
| * | | am 2001d2ac: Merge "MPEG2TSWriter: Write proper continuity counters for PAT a...Jean-Baptiste Queru2012-08-101-7/+17
| |\ \ \ | | |/ /
| | * | Merge "MPEG2TSWriter: Write proper continuity counters for PAT and PMT"Jean-Baptiste Queru2012-08-101-7/+17
| | |\ \ | | | |/
| | | * MPEG2TSWriter: Write proper continuity counters for PAT and PMTPaul Fariello2012-07-101-7/+17
* | | | Merge "Handle malformed raw AAC/AMR writer better" into jb-mr1-devJames Dong2012-08-102-3/+19
|\ \ \ \
| * | | | Handle malformed raw AAC/AMR writer betterJames Dong2012-08-092-3/+19
* | | | | Fix static sample table processing, add support for h.263 video.Andreas Huber2012-08-093-55/+49
|/ / / /
* | | | am 51af4af2: am e28df5b9: Merge "Store correct time stamps in recorded mp4 fi...Jean-Baptiste Queru2012-08-081-6/+15
|\ \ \ \ | |/ / /
| * | | am e28df5b9: Merge "Store correct time stamps in recorded mp4 files"Jean-Baptiste Queru2012-08-081-6/+15
| |\ \ \ | | |/ /
| | * | Merge "Store correct time stamps in recorded mp4 files"Jean-Baptiste Queru2012-08-081-6/+15
| | |\ \
| | | * | Store correct time stamps in recorded mp4 filesJohannes Carlsson2012-07-301-6/+15
| | | |/
* | | | am ef620093: am efee0095: Merge "Correct ID3::StringSize calculation for UCS-...Jean-Baptiste Queru2012-08-081-1/+2
|\ \ \ \ | |/ / /
| * | | am efee0095: Merge "Correct ID3::StringSize calculation for UCS-2 data."Jean-Baptiste Queru2012-08-081-1/+2
| |\ \ \ | | |/ /
| | * | Merge "Correct ID3::StringSize calculation for UCS-2 data."Jean-Baptiste Queru2012-08-081-1/+2
| | |\ \
| | | * | Correct ID3::StringSize calculation for UCS-2 data.Jesper Tragardh2012-07-111-1/+2
| | | |/
* | | | am 662b15c3: am a858aa96: Merge "avcenc: Remove redundant zero-initialization...Jean-Baptiste Queru2012-08-082-10/+0
|\ \ \ \ | |/ / /
| * | | am a858aa96: Merge "avcenc: Remove redundant zero-initialization of allocated...Jean-Baptiste Queru2012-08-082-10/+0
| |\ \ \ | | |/ /
| | * | Merge "avcenc: Remove redundant zero-initialization of allocated memory"Jean-Baptiste Queru2012-08-082-10/+0
| | |\ \
| | | * | avcenc: Remove redundant zero-initialization of allocated memoryMartin Storsjo2012-07-122-10/+0
* | | | | am 44237a8d: am b71298ee: Merge "avcenc: Initialize all memory allocated by t...Jean-Baptiste Queru2012-08-082-2/+5
|\ \ \ \ \ | |/ / / /
| * | | | am b71298ee: Merge "avcenc: Initialize all memory allocated by the CBAVC_Mall...Jean-Baptiste Queru2012-08-082-2/+5
| |\ \ \ \ | | |/ / /
| | * | | Merge "avcenc: Initialize all memory allocated by the CBAVC_Malloc callback f...Jean-Baptiste Queru2012-08-082-2/+5
| | |\ \ \ | | | |/ /
| | | * | avcenc: Initialize all memory allocated by the CBAVC_Malloc callback functionMartin Storsjo2012-07-122-2/+5
* | | | | am 68d44b06: am 0ab18f85: Merge "avcenc: Remove useless casts"Jean-Baptiste Queru2012-08-081-2/+2
|\ \ \ \ \ | |/ / / /
| * | | | am 0ab18f85: Merge "avcenc: Remove useless casts"Jean-Baptiste Queru2012-08-081-2/+2
| |\ \ \ \ | | |/ / /
| | * | | Merge "avcenc: Remove useless casts"Jean-Baptiste Queru2012-08-081-2/+2
| | |\ \ \
| | | * | | avcenc: Remove useless castsMartin Storsjo2012-07-101-2/+2
| | | |/ /
* | | | | am 96d18cca: am 0822156c: Merge "avcenc: Fix indentation"Jean-Baptiste Queru2012-08-081-2/+2
|\ \ \ \ \ | |/ / / /
| * | | | am 0822156c: Merge "avcenc: Fix indentation"Jean-Baptiste Queru2012-08-081-2/+2
| |\ \ \ \ | | |/ / /
| | * | | Merge "avcenc: Fix indentation"Jean-Baptiste Queru2012-08-081-2/+2
| | |\ \ \
| | | * | | avcenc: Fix indentationMartin Storsjo2012-07-101-2/+2
| | | | |/ | | | |/|
* | | | | am 80c46255: am 874a074a: Merge "avcenc: Switch malloc/free callbacks to use ...Jean-Baptiste Queru2012-08-087-35/+35
|\ \ \ \ \ | |/ / / /
| * | | | am 874a074a: Merge "avcenc: Switch malloc/free callbacks to use pointers inst...Jean-Baptiste Queru2012-08-087-35/+35
| |\ \ \ \ | | |/ / /
| | * | | 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
| | | |/
| * | | am b7ee9c44: Merge "mediacodec: Return an error on getOutputFormat if there i...Jean-Baptiste Queru2012-08-081-1/+2
| |\ \ \ | | |/ /
| | * | mediacodec: Return an error on getOutputFormat if there is no output format yetMartin Storsjo2012-07-131-1/+2
| | |/
* | | Fix a small build warning.John Grossman2012-08-081-1/+2
* | | Merge "Make sure that the trackId starts from 1" into jb-mr1-devJames Dong2012-08-081-2/+2
|\ \ \
| * | | Make sure that the trackId starts from 1James Dong2012-08-071-2/+2
* | | | Merge "Handle empty stsc box" into jb-mr1-devMarco Nelissen2012-08-081-2/+9
|\ \ \ \ | |/ / / |/| | |
| * | | Handle empty stsc boxMarco Nelissen2012-08-081-2/+9
* | | | Merge "Remove the no longer used PV software aac decoder." into jb-mr1-devAndreas Huber2012-08-07339-82369/+19
|\ \ \ \
| * | | | Remove the no longer used PV software aac decoder.Andreas Huber2012-08-07339-82369/+19
* | | | | Only emit padding at the end of the stream in the aac and mp3 decodersAndreas Huber2012-08-073-25/+68
|/ / / /
* | | | Make sure codec names and corresponding quirks are returned together.Andreas Huber2012-08-072-33/+31
|/ / /