ffmpeg/libavresample
Michael Niedermayer 18b0c39f99 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  g723.1: fix addition overflow
  g723.1: simplify and fix multiplication overflow
  g723.1: deobfuscate an expression
  g723.1: remove unused #includes
  ARM: add missing "cc" clobber in av_clipl_int32_arm()
  rtmp: Factorize the code by adding handle_invoke_error
  rtmp: Factorize the code by adding handle_invoke_status
  rtmp: Factorize the code by adding handle_invoke_result
  libavutil: remove unused av_abort() macro
  ffmenc: replace if/abort with assert()
  libavutil: drop offsetof() fallback definition
  libavutil: drop fallback definitions of INTxx_MIN/MAX
  configure: Check for a sctp struct instead of just the header
  configure: suncc: Add -xc99 to dependency flags, required on Solaris
  doxygen: Fix function parameter names to match the code
  doc: Drop obsolete shared libs cflags hint to workaround Cygwin gcc bugs
  swf: Move shared table out of the header file
  swf: Move swf_audio_codec_tags table to the only place it is used
  fate: add G.723.1 decoder tests

Conflicts:
	configure
	doc/platform.texi
	libavformat/Makefile
	libavutil/arm/intmath.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-10 16:25:23 +02:00
..
x86 x86: add colons after labels 2012-08-07 15:20:56 +01:00
Makefile
audio_convert.c
audio_convert.h doxygen: Fix function parameter names to match the code 2012-08-09 20:05:55 +02:00
audio_data.c
audio_data.h
audio_mix.c lavr: fix handling of custom mix matrices 2012-08-04 10:28:22 -04:00
audio_mix.h doxygen: Fix function parameter names to match the code 2012-08-09 20:05:55 +02:00
audio_mix_matrix.c lavr: fix handling of custom mix matrices 2012-08-04 10:28:22 -04:00
avresample-test.c
avresample.h
internal.h
libavresample.v
options.c
resample.c lavr: resampling: add support for s32p, fltp, and dblp internal sample formats 2012-07-08 15:22:11 -04:00
resample.h
resample_template.c Merge remote-tracking branch 'qatar/master' 2012-07-09 22:40:12 +02:00
utils.c Merge remote-tracking branch 'qatar/master' 2012-08-04 23:51:43 +02:00
version.h