Michael Niedermayer a1fc1d2e1b Merge remote-tracking branch 'qatar/master' ...

* qatar/master:
  pcm-mpeg: improve log message wording
  fate: add missing $(TARGET_PATH) to ac3-fixed-encode
  fate: fix md5sum replacement on some systems
  avprobe: correctly set the default formatter
  lavr: add x86-optimized function for mixing 2 to 1 s16p with q8 coeffs
  lavr: add x86-optimized functions for mixing 2 to 1 s16p with float coeffs
  lavr: add C functions for mixing 2 to 1 channels with s16p format
  avprobe: move formatter functions in the context

Conflicts:
	ffprobe.c
	libavcodec/pcm-mpeg.c
	tests/fate/ac3.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2012-05-30 19:32:06 +02:00

..

x86

lavr: add x86-optimized function for mixing 2 to 1 s16p with q8 coeffs

2012-05-29 15:33:25 -04:00

audio_convert.c

Add libavresample

2012-04-24 21:28:27 -04:00

audio_convert.h

Add libavresample

2012-04-24 21:28:27 -04:00

audio_data.c

Add libavresample

2012-04-24 21:28:27 -04:00

audio_data.h

Add libavresample

2012-04-24 21:28:27 -04:00

audio_mix_matrix.c

lavr: use 8.8 instead of 10.6 as the 16-bit fixed-point mixing coeff type

2012-05-01 13:52:59 -04:00

audio_mix.c

lavr: add C functions for mixing 2 to 1 channels with s16p format

2012-05-29 15:16:20 -04:00

audio_mix.h

lavr: use 8.8 instead of 10.6 as the 16-bit fixed-point mixing coeff type

2012-05-01 13:52:59 -04:00

avresample-test.c

Add libavresample

2012-04-24 21:28:27 -04:00

avresample.h

lavr: make avresample_read() with NULL output discard samples.

2012-05-09 17:37:47 +02:00

internal.h

Add libavresample

2012-04-24 21:28:27 -04:00

libavresample.v

Add libavresample

2012-04-24 21:28:27 -04:00

Makefile

build: cosmetics: Add missing end-of-line backslashes to item lists.

2012-05-07 14:17:40 +02:00

options.c

lavr: use 8.8 instead of 10.6 as the 16-bit fixed-point mixing coeff type

2012-05-01 13:52:59 -04:00

resample.c

Add libavresample

2012-04-24 21:28:27 -04:00

resample.h

Add libavresample

2012-04-24 21:28:27 -04:00

utils.c

Merge remote-tracking branch 'qatar/master'

2012-05-10 02:25:41 +02:00

version.h

lavr: make avresample_read() with NULL output discard samples.

2012-05-09 17:37:47 +02:00