FFmpeg/libavresample
Michael Niedermayer b536e2facf Merge remote-tracking branch 'qatar/master'
* qatar/master:
  avconv: add an assert to silence an uninitialized variable warning.
  avconv: shut up an uninitialized variable warning.
  avfiltergraph: shut up uninitialized variable warning.
  af_join: initialize a variable to shut up gcc warning.
  amix: fix format specifier for AVFilterLink.sample_rate.
  lavfi: make filters less verbose.
  mpc8: read APE tags.
  lavr: x86: fix ff_conv_fltp_to_flt_6ch function prototypes
  libm: provide fallback definition for cbrtf() using powf()
  network: Don't redefine error codes if they already exist in errno.h
  configure: Check for sys/time.h
  network: Include unistd.h from network.h
  avconv: don't include vsrc_buffer.h, which doesn't exist anymore
  lavfi: reorder AVFilterLink fields.
  lavfi: reorder AVFilterContext fields.
  lavfi: reorder AVFilter fields.
  lavfi: reorder AVFilterBufferRef fields.
  lavfi: reorder AVFilterBuffer fields.

Conflicts:
	configure
	libavcodec/v210dec.h
	libavfilter/asrc_anullsrc.c
	libavfilter/avfilter.h
	libavfilter/buffersrc.c
	libavfilter/src_movie.c
	libavfilter/vf_aspect.c
	libavfilter/vf_crop.c
	libavfilter/vf_drawbox.c
	libavfilter/vf_fade.c
	libavfilter/vf_overlay.c
	libavfilter/vf_pad.c
	libavfilter/vf_scale.c
	libavfilter/vsrc_color.c
	libavformat/network.h
	libavutil/libm.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-27 01:58:09 +02:00
..
x86 lavr: x86: fix ff_conv_fltp_to_flt_6ch function prototypes 2012-06-26 12:29:35 -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 Add Dolby/DPLII downmix support to libavresample 2012-06-18 10:55:00 -04:00
audio_mix.c Add Dolby/DPLII downmix support to libavresample 2012-06-18 10:55:00 -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 Add Dolby/DPLII downmix support to libavresample 2012-06-18 10:55:00 -04:00
internal.h Add Dolby/DPLII downmix support to libavresample 2012-06-18 10:55:00 -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 Add Dolby/DPLII downmix support to libavresample 2012-06-18 10:55:00 -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 Add Dolby/DPLII downmix support to libavresample 2012-06-18 10:55:00 -04:00