ffmpeg/libavresample
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
..
arm
x86 Merge remote-tracking branch 'qatar/master' 2013-01-09 12:30:14 +01:00
Makefile lavr: add option for dithering during sample format conversion to s16 2012-12-19 18:52:54 -05:00
audio_convert.c lavr: add a public function for setting a custom channel map 2013-01-07 21:49:06 -05:00
audio_convert.h lavr: add a public function for setting a custom channel map 2013-01-07 21:49:06 -05:00
audio_data.c lavr: add a public function for setting a custom channel map 2013-01-07 21:49:06 -05:00
audio_data.h lavr: add a public function for setting a custom channel map 2013-01-07 21:49:06 -05:00
audio_mix.c lavr: log channel conversion description for any-to-any functions 2013-01-07 21:49:07 -05:00
audio_mix.h lavr: typedef internal structs in internal.h 2013-01-07 21:49:05 -05:00
audio_mix_matrix.c
avresample-test.c miscellaneous typo fixes 2012-12-21 00:18:34 +01:00
avresample.h lavr: add a public function for setting a custom channel map 2013-01-07 21:49:06 -05:00
dither.c x86: lavr: add SSE2 quantize() for dithering 2013-01-08 14:52:43 -05:00
dither.h x86: lavr: add SSE2 quantize() for dithering 2013-01-08 14:52:43 -05:00
internal.h lavr: add a public function for setting a custom channel map 2013-01-07 21:49:06 -05:00
libavresample.v
options.c lavr: add option for dithering during sample format conversion to s16 2012-12-19 18:52:54 -05:00
resample.c lavr: typedef internal structs in internal.h 2013-01-07 21:49:05 -05:00
resample.h lavr: typedef internal structs in internal.h 2013-01-07 21:49:05 -05:00
resample_template.c
utils.c Merge commit '074a00d192c0e749d677b008b337da42597e780f' 2013-01-08 12:56:41 +01:00
version.h lavr: add a public function for setting a custom channel map 2013-01-07 21:49:06 -05:00