summaryrefslogtreecommitdiff
path: root/libavresample
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'b6649ab5037fb55f78c2606f3d23cea0867cdeaa'Michael Niedermayer2013-03-283-167/+166
|\
| * cosmetics: Remove unnecessary extern keywords from function declarationsDiego Biurrun2013-03-273-167/+166
* | Merge commit '45235ac488363e3360bf2f2275102d1ec66eba0f'Michael Niedermayer2013-02-241-1/+13
|\ \ | |/
| * lavr: allow setting internal_sample_fmt option by stringJustin Ruggles2013-02-231-1/+11
| * lavr: Add "resample_cutoff" option as a duplicate of "cutoff"Justin Ruggles2013-02-231-0/+2
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-02-131-14/+35
|\ \ | |/
| * lavr: fix mixing matrix reduction when normalization is disabledJustin Ruggles2013-02-121-0/+11
| * lavr: fix matrix reduction for upmixing in certain casesJustin Ruggles2013-02-121-0/+10
| * lavr: cosmetics: reindentJustin Ruggles2013-02-121-14/+14
* | Merge commit '1647da89dd8ac09a55c111589f7a30d7e6b87d90'Michael Niedermayer2013-02-131-44/+57
|\ \ | |/
| * lavr: make sure that the mix function is reset even if no mixing will be doneJustin Ruggles2013-02-121-21/+31
| * lavr: print out the mix matrix in ff_audio_mix_set_matrix()Justin Ruggles2013-02-121-26/+29
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-01-181-8/+5
|\ \ | |/
| * lavr: always reset mix function names and pointers in mix_function_init()Justin Ruggles2013-01-171-3/+4
| * lavr: call mix_function_init() in ff_audio_mix_set_matrix()Justin Ruggles2013-01-171-5/+1
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-01-092-0/+86
|\ \ | |/
| * x86: lavr: add SSE2/AVX dither_int_to_float()Justin Ruggles2013-01-082-0/+86
* | Merge commit '1fb8f6a44f06e48386450fe0363aefc02583d24a'Michael Niedermayer2013-01-095-0/+102
|\ \ | |/
| * x86: lavr: add SSE2 quantize() for ditheringJustin Ruggles2013-01-085-0/+102
* | Merge commit '8729698d50739524665090e083d1bfdf28235724'Michael Niedermayer2013-01-082-57/+217
|\ \ | |/
| * lavr: log channel conversion description for any-to-any functionsJustin Ruggles2013-01-071-2/+3
| * lavr: mix: reduce the mixing matrix when possibleJustin Ruggles2013-01-071-30/+186
| * lavr: cosmetics: reindentJustin Ruggles2013-01-071-25/+28
* | Merge commit '074a00d192c0e749d677b008b337da42597e780f'Michael Niedermayer2013-01-0813-41/+317
|\ \ | |/
| * lavr: add a public function for setting a custom channel mapJustin Ruggles2013-01-0710-27/+301
| * lavr: typedef internal structs in internal.hJustin Ruggles2013-01-078-14/+16
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-01-061-26/+9
|\ \ | |/
| * x86: lavr: use the x86inc.asm automatic stack alignment in mixing functionsJustin Ruggles2013-01-051-26/+9
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-01-041-1/+1
|\ \ | |/
| * lavr: fix missing " in header documentationPeter Meerwald2013-01-041-1/+1
* | Merge commit '511cf612ac979f536fd65e14603a87ca5ad435f3'Michael Niedermayer2012-12-211-1/+1
|\ \ | |/
| * miscellaneous typo fixesDiego Biurrun2012-12-211-1/+1
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-12-2010-12/+583
|\ \ | |/
| * lavr: add option for dithering during sample format conversion to s16Justin Ruggles2012-12-1910-12/+583
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-12-174-12/+20
|\ \ | |/
| * avresample: use valid log context in mixing functionsHendrik Leppkes2012-12-161-5/+5
| * lavr: remove automatic context close/open for resampling compensationJustin Ruggles2012-12-163-7/+15
* | Merge commit 'f322b2073581119de5da74f92a03309a36891cfa'Michael Niedermayer2012-12-171-6/+12
|\ \ | |/
| * lavr: only save/restore the mixing matrix if mixing is being doneJustin Ruggles2012-12-161-6/+12
* | Merge commit '27c8337e595a058347150269d5c2c48281e4285b'Michael Niedermayer2012-12-162-22/+24
|\ \ | |/
| * lavr: move AudioMix struct definition to audio_mix.cJustin Ruggles2012-12-152-22/+24
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-12-121-1/+1
|\ \ | |/
| * lavr: fix segfault due to overlooked change needed in 14758e3Justin Ruggles2012-12-121-1/+1
* | Merge commit '14758e3211d34a97c42b07acae117ce5627d7f57'Michael Niedermayer2012-12-127-159/+221
|\ \ | |/
| * lavr: temporarily store custom matrix in AVAudioResampleContextJustin Ruggles2012-12-116-158/+216
| * lavr: clarify documentation for avresample_get/set_matrix()Justin Ruggles2012-12-111-1/+5
* | Merge commit 'f5fa03660db16f9d78abc5a626438b4d0b54f563'Michael Niedermayer2012-11-285-19/+18
|\ \ | |/
| * lavr: do not pass consumed samples as a parameter to ff_audio_resample()Justin Ruggles2012-11-273-10/+6
| * lavr: correct the documentation for the ff_audio_resample() return valueJustin Ruggles2012-11-271-1/+1
| * lavr: do not pass sample count as a parameter to ff_audio_convert()Justin Ruggles2012-11-273-8/+11
View Lorry Controller Status