ffmpeg/libavresample
Michael Niedermayer 830a567e96 Merge commit 'df6737a55f5dc7c0ae5272bc5fa6182836d5481c'
* commit 'df6737a55f5dc7c0ae5272bc5fa6182836d5481c':
  audio_mix: fix channel order in mix_1_to_2_fltp_flt_c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-13 06:48:35 +02:00
..
arm Merge remote-tracking branch 'qatar/master' 2012-09-14 14:13:38 +02:00
x86 Reinstate proper FFmpeg license for all files. 2013-08-30 15:47:38 +00:00
Makefile lavr: add option for dithering during sample format conversion to s16 2012-12-19 18:52:54 -05:00
audio_convert.c Reinstate proper FFmpeg license for all files. 2013-08-30 15:47:38 +00:00
audio_convert.h Reinstate proper FFmpeg license for all files. 2013-08-30 15:47:38 +00:00
audio_data.c Reinstate proper FFmpeg license for all files. 2013-08-30 15:47:38 +00:00
audio_data.h Reinstate proper FFmpeg license for all files. 2013-08-30 15:47:38 +00:00
audio_mix.c Merge commit 'df6737a55f5dc7c0ae5272bc5fa6182836d5481c' 2013-10-13 06:48:35 +02:00
audio_mix.h Reinstate proper FFmpeg license for all files. 2013-08-30 15:47:38 +00:00
audio_mix_matrix.c Reinstate proper FFmpeg license for all files. 2013-08-30 15:47:38 +00:00
avresample-test.c Reinstate proper FFmpeg license for all files. 2013-08-30 15:47:38 +00:00
avresample.h Reinstate proper FFmpeg license for all files. 2013-08-30 15:47:38 +00:00
dither.c Reinstate proper FFmpeg license for all files. 2013-08-30 15:47:38 +00:00
dither.h Reinstate proper FFmpeg license for all files. 2013-08-30 15:47:38 +00:00
internal.h Reinstate proper FFmpeg license for all files. 2013-08-30 15:47:38 +00:00
libavresample.v
options.c Reinstate proper FFmpeg license for all files. 2013-08-30 15:47:38 +00:00
resample.c Reinstate proper FFmpeg license for all files. 2013-08-30 15:47:38 +00:00
resample.h Reinstate proper FFmpeg license for all files. 2013-08-30 15:47:38 +00:00
resample_template.c Merge remote-tracking branch 'qatar/master' 2012-07-09 22:40:12 +02:00
utils.c Reinstate proper FFmpeg license for all files. 2013-08-30 15:47:38 +00:00
version.h Reinstate proper FFmpeg license for all files. 2013-08-30 15:47:38 +00:00