| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge remote-tracking branch 'qatar/master' | Michael Niedermayer | 2013-02-13 | 1 | -14/+35 |
|\ |
|
| * | lavr: fix mixing matrix reduction when normalization is disabled | Justin Ruggles | 2013-02-12 | 1 | -0/+11 |
| * | lavr: fix matrix reduction for upmixing in certain cases | Justin Ruggles | 2013-02-12 | 1 | -0/+10 |
| * | lavr: cosmetics: reindent | Justin Ruggles | 2013-02-12 | 1 | -14/+14 |
* | | Merge commit '1647da89dd8ac09a55c111589f7a30d7e6b87d90' | Michael Niedermayer | 2013-02-13 | 1 | -44/+57 |
|\| |
|
| * | lavr: make sure that the mix function is reset even if no mixing will be done | Justin Ruggles | 2013-02-12 | 1 | -21/+31 |
| * | lavr: print out the mix matrix in ff_audio_mix_set_matrix() | Justin Ruggles | 2013-02-12 | 1 | -26/+29 |
* | | Merge remote-tracking branch 'qatar/master' | Michael Niedermayer | 2013-01-18 | 1 | -8/+5 |
|\| |
|
| * | lavr: always reset mix function names and pointers in mix_function_init() | Justin Ruggles | 2013-01-17 | 1 | -3/+4 |
| * | lavr: call mix_function_init() in ff_audio_mix_set_matrix() | Justin Ruggles | 2013-01-17 | 1 | -5/+1 |
* | | Merge remote-tracking branch 'qatar/master' | Michael Niedermayer | 2013-01-09 | 2 | -0/+86 |
|\| |
|
| * | x86: lavr: add SSE2/AVX dither_int_to_float() | Justin Ruggles | 2013-01-08 | 2 | -0/+86 |
* | | Merge commit '1fb8f6a44f06e48386450fe0363aefc02583d24a' | Michael Niedermayer | 2013-01-09 | 5 | -0/+102 |
|\| |
|
| * | x86: lavr: add SSE2 quantize() for dithering | Justin Ruggles | 2013-01-08 | 5 | -0/+102 |
* | | Merge commit '8729698d50739524665090e083d1bfdf28235724' | Michael Niedermayer | 2013-01-08 | 2 | -57/+217 |
|\| |
|
| * | lavr: log channel conversion description for any-to-any functions | Justin Ruggles | 2013-01-07 | 1 | -2/+3 |
| * | lavr: mix: reduce the mixing matrix when possible | Justin Ruggles | 2013-01-07 | 1 | -30/+186 |
| * | lavr: cosmetics: reindent | Justin Ruggles | 2013-01-07 | 1 | -25/+28 |
* | | Merge commit '074a00d192c0e749d677b008b337da42597e780f' | Michael Niedermayer | 2013-01-08 | 13 | -41/+317 |
|\| |
|
| * | lavr: add a public function for setting a custom channel map | Justin Ruggles | 2013-01-07 | 10 | -27/+301 |
| * | lavr: typedef internal structs in internal.h | Justin Ruggles | 2013-01-07 | 8 | -14/+16 |
* | | Merge remote-tracking branch 'qatar/master' | Michael Niedermayer | 2013-01-06 | 1 | -26/+9 |
|\| |
|
| * | x86: lavr: use the x86inc.asm automatic stack alignment in mixing functions | Justin Ruggles | 2013-01-05 | 1 | -26/+9 |
* | | Merge remote-tracking branch 'qatar/master' | Michael Niedermayer | 2013-01-04 | 1 | -1/+1 |
|\| |
|
| * | lavr: fix missing " in header documentation | Peter Meerwald | 2013-01-04 | 1 | -1/+1 |
* | | Merge commit '511cf612ac979f536fd65e14603a87ca5ad435f3' | Michael Niedermayer | 2012-12-21 | 1 | -1/+1 |
|\| |
|
| * | miscellaneous typo fixes | Diego Biurrun | 2012-12-21 | 1 | -1/+1 |
* | | Merge remote-tracking branch 'qatar/master' | Michael Niedermayer | 2012-12-20 | 10 | -12/+583 |
|\| |
|
| * | lavr: add option for dithering during sample format conversion to s16 | Justin Ruggles | 2012-12-19 | 10 | -12/+583 |
* | | Merge remote-tracking branch 'qatar/master' | Michael Niedermayer | 2012-12-17 | 4 | -12/+20 |
|\| |
|
| * | avresample: use valid log context in mixing functions | Hendrik Leppkes | 2012-12-16 | 1 | -5/+5 |
| * | lavr: remove automatic context close/open for resampling compensation | Justin Ruggles | 2012-12-16 | 3 | -7/+15 |
* | | Merge commit 'f322b2073581119de5da74f92a03309a36891cfa' | Michael Niedermayer | 2012-12-17 | 1 | -6/+12 |
|\| |
|
| * | lavr: only save/restore the mixing matrix if mixing is being done | Justin Ruggles | 2012-12-16 | 1 | -6/+12 |
* | | Merge commit '27c8337e595a058347150269d5c2c48281e4285b' | Michael Niedermayer | 2012-12-16 | 2 | -22/+24 |
|\| |
|
| * | lavr: move AudioMix struct definition to audio_mix.c | Justin Ruggles | 2012-12-15 | 2 | -22/+24 |
* | | Merge remote-tracking branch 'qatar/master' | Michael Niedermayer | 2012-12-12 | 1 | -1/+1 |
|\| |
|
| * | lavr: fix segfault due to overlooked change needed in 14758e3 | Justin Ruggles | 2012-12-12 | 1 | -1/+1 |
* | | Merge commit '14758e3211d34a97c42b07acae117ce5627d7f57' | Michael Niedermayer | 2012-12-12 | 7 | -159/+221 |
|\| |
|
| * | lavr: temporarily store custom matrix in AVAudioResampleContext | Justin Ruggles | 2012-12-11 | 6 | -158/+216 |
| * | lavr: clarify documentation for avresample_get/set_matrix() | Justin Ruggles | 2012-12-11 | 1 | -1/+5 |
* | | Merge commit 'f5fa03660db16f9d78abc5a626438b4d0b54f563' | Michael Niedermayer | 2012-11-28 | 5 | -19/+18 |
|\| |
|
| * | lavr: do not pass consumed samples as a parameter to ff_audio_resample() | Justin Ruggles | 2012-11-27 | 3 | -10/+6 |
| * | lavr: correct the documentation for the ff_audio_resample() return value | Justin Ruggles | 2012-11-27 | 1 | -1/+1 |
| * | lavr: do not pass sample count as a parameter to ff_audio_convert() | Justin Ruggles | 2012-11-27 | 3 | -8/+11 |
* | | Merge remote-tracking branch 'qatar/master' | Michael Niedermayer | 2012-11-18 | 2 | -5/+14 |
|\| |
|
| * | x86: lavr: fix stack allocation for 7 and 8 channel downmixing on x86-32 | Ronald S. Bultje | 2012-11-17 | 1 | -1/+9 |
| * | lavr: fix the decision for writing directly to the output buffer | Justin Ruggles | 2012-11-17 | 1 | -4/+5 |
| * | build: Drop AVX assembly ifdefs | Diego Biurrun | 2012-11-11 | 2 | -42/+0 |
* | | Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88' | Michael Niedermayer | 2012-11-12 | 1 | -1/+1 |
|\| |
|