Michael Niedermayer 4765f63538 Merge remote-tracking branch 'qatar/master' ... * qatar/master: xan: Convert to bytestream2 oggenc: add a page_duration option and deprecate the pagesize option x86: lavr: add SSE2/AVX dither_int_to_float() Conflicts: libavcodec/xan.c libavformat/oggenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2013-01-09 12:30:14 +01:00
..
Makefile	x86: lavr: add SSE2 quantize() for dithering	2013-01-08 14:52:43 -05:00
audio_convert.asm	…
audio_convert_init.c	…
audio_mix.asm	Merge remote-tracking branch 'qatar/master'	2013-01-06 13:20:23 +01:00
audio_mix_init.c	…
dither.asm	Merge remote-tracking branch 'qatar/master'	2013-01-09 12:30:14 +01:00
dither_init.c	Merge remote-tracking branch 'qatar/master'	2013-01-09 12:30:14 +01:00
util.asm	…