summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | 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 eeb9fde0: am 3f5d2e17: Merge "aacenc/amrwbenc: Remove unused and dubious t...Jean-Baptiste Queru2012-08-161-24/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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 add9f820: am 2c3d9b7b: Merge "MPEG2TSWriter: Correctly add padding using t...Jean-Baptiste Queru2012-08-151-6/+27
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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
* | | | | | Merge "Fix AAC DRC metadata being ignored" into jb-mr1-devJean-Michel Trivi2012-08-131-0/+5
|\ \ \ \ \ \
| * | | | | | Fix AAC DRC metadata being ignoredJean-Michel Trivi2012-08-131-0/+5
* | | | | | | am 979df012: am 98159acd: Merge "amrnb: Restart the p_xn pointer when retrave...Jean-Baptiste Queru2012-08-131-1/+2
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | 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
| | | | |_|/ / | | | |/| | |
* | | | | | | Use the correct data offset by remembering the offset of the enclosing 'moof'Andreas Huber2012-08-132-8/+15
* | | | | | | am 10004fe6: am 5efa7bf9: Merge "amrnb: Fix audio distortion in an AMR-NB clip"Jean-Baptiste Queru2012-08-131-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | 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
| | | |/ / /
* | | | | | Merge changes Ibe7e6d4b,Icf8904db into jb-mr1-devJohn Grossman2012-08-1325-6343/+513
|\ \ \ \ \ \
| * | | | | | Move the AAH RTP code out of framework and into vendor.John Grossman2012-08-1320-6193/+1
| * | | | | | Add the ability to dynamicaly register MediaPlayer types.John Grossman2012-08-137-215/+577
* | | | | | | Merge "Signal end of stream if no more fragments are going to be available." ...Andreas Huber2012-08-132-1/+15
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Signal end of stream if no more fragments are going to be available.Andreas Huber2012-08-092-1/+15
* | | | | | | 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
| | |\ \ \ \ | | | |/ / /