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

* qatar/master:
  os_support: Choose between direct.h and io.h using a configure check
  os_support: Include io.h instead of direct.h on mingw32ce
  x86: ac3dsp: Only refer to the ac3_downmix_sse symbol if it has been declared
  swscale: Remove two bogus asserts
  ac3: move ac3_downmix() from dsputil to ac3dsp
  lavr/audio_mix_matrix: acknowledge the existence of LFE2.
  mlp_parser: avoid mapping multiple disctinct TrueHD channels to the same Libav channel.
  lavu/audioconvert: add a second low frequency channel.

Conflicts:
	doc/APIchanges
	libavcodec/ac3dsp.c
	libavcodec/ac3dsp.h
	libavcodec/mlp_parser.c
	libavutil/audioconvert.c
	libavutil/version.h

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

2012-09-13 15:35:50 +02:00

..

x86

x86: Replace checks for CPU extensions and flags by convenience macros

2012-09-08 18:18:34 +02:00

audio_convert.c

Don't include common.h from avutil.h

2012-08-15 22:32:06 +03:00

audio_convert.h

doxygen: Fix function parameter names to match the code

2012-08-09 20:05:55 +02:00

audio_data.c

Don't include common.h from avutil.h

2012-08-15 22:32:06 +03:00

audio_data.h

…

audio_mix_matrix.c

lavr/audio_mix_matrix: acknowledge the existence of LFE2.

2012-09-12 18:26:53 -04:00

audio_mix.c

Don't include common.h from avutil.h

2012-08-15 22:32:06 +03:00

audio_mix.h

doxygen: Fix function parameter names to match the code

2012-08-09 20:05:55 +02:00

avresample-test.c

Don't include common.h from avutil.h

2012-08-15 22:32:06 +03:00

avresample.h

lavr: resampling: add filter type and Kaiser window beta to AVOptions

2012-07-08 15:22:11 -04:00

internal.h

libavresample: add mix level normalization option

2012-08-14 23:36:56 +02:00

libavresample.v

…

Makefile

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

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

options.c

avopt: Explicitly store float/double option defaults in .dbl

2012-09-04 23:13:51 +03:00

resample_template.c

Merge remote-tracking branch 'qatar/master'

2012-07-09 22:40:12 +02:00

resample.c

Don't include common.h from avutil.h

2012-08-15 22:32:06 +03:00

resample.h

…

utils.c

Merge remote-tracking branch 'qatar/master'

2012-08-16 16:20:30 +02:00

version.h

Clarify Doxygen comment for FF_API_* #defines.

2012-07-04 15:10:10 +02:00