summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
...
| | * | hardening: eliminate text relocations from mp3Ard Biesheuvel2012-08-133-7/+9
* | | | am b7ca7dc9: Merge "avcenc: Clarify the ifdefs surrounding inline assembly"Jean-Baptiste Queru2012-08-164-4/+12
|\ \ \ \ | |/ / /
| * | | Merge "avcenc: Clarify the ifdefs surrounding inline assembly"Jean-Baptiste Queru2012-08-164-4/+12
| |\ \ \
| | * | | avcenc: Clarify the ifdefs surrounding inline assemblyMartin Storsjo2012-07-104-4/+12
| | | |/ | | |/|
* | | | am 4f981882: Merge "hardening: eliminate text relocations from amrwb"Jean-Baptiste Queru2012-08-163-6/+12
|\ \ \ \ | |/ / /
| * | | Merge "hardening: eliminate text relocations from amrwb"Jean-Baptiste Queru2012-08-163-6/+12
| |\ \ \ | | | |/ | | |/|
| | * | hardening: eliminate text relocations from amrwbArd Biesheuvel2012-08-133-6/+12
* | | | am c3bfa026: Merge "aacenc/amrwbenc: Remove the now unused LINUX define"Jean-Baptiste Queru2012-08-166-11/+1
|\ \ \ \ | |/ / /
| * | | aacenc/amrwbenc: Remove the now unused LINUX defineMartin Storsjo2012-08-166-11/+1
* | | | am 3f5d2e17: Merge "aacenc/amrwbenc: Remove unused and dubious typedefs"Jean-Baptiste Queru2012-08-161-24/+0
|\ \ \ \ | |/ / /
| * | | aacenc/amrwbenc: Remove unused and dubious typedefsMartin Storsjo2012-08-161-24/+0
* | | | am 2c3d9b7b: Merge "MPEG2TSWriter: Correctly add padding using the adaptation...Jean-Baptiste Queru2012-08-151-6/+27
|\ \ \ \ | |/ / /
| * | | MPEG2TSWriter: Correctly add padding using the adaptation fieldPaul Fariello2012-08-151-6/+27
* | | | am 98159acd: Merge "amrnb: Restart the p_xn pointer when retraversing the arr...Jean-Baptiste Queru2012-08-131-1/+2
|\ \ \ \ | |/ / /
| * | | Merge "amrnb: Restart the p_xn pointer when retraversing the array on overflow"Jean-Baptiste Queru2012-08-131-1/+2
| |\ \ \
| | * | | amrnb: Restart the p_xn pointer when retraversing the array on overflowMartin Storsjo2012-07-101-1/+2
| | | |/ | | |/|
* | | | am 5efa7bf9: Merge "amrnb: Fix audio distortion in an AMR-NB clip"Jean-Baptiste Queru2012-08-131-1/+1
|\ \ \ \ | |/ / /
| * | | Merge "amrnb: Fix audio distortion in an AMR-NB clip"Jean-Baptiste Queru2012-08-131-1/+1
| |\ \ \ | | |_|/ | |/| |
| | * | amrnb: Fix audio distortion in an AMR-NB clipPacketVideo CM2012-07-101-1/+1
| | |/
* | | 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 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
| | |/
* | | 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 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 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 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 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 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 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
| |/
* | am 65e8d62a: Merge "Fixed sample video corrupted in MediaCodec mode." into jb...Edwin Wong2012-07-134-23/+18
|\ \ | |/ |/|
| * Fixed sample video corrupted in MediaCodec mode.Edwin Wong2012-07-134-23/+18