Michael Niedermayer 264441715b Merge commit 'f5fa03660db16f9d78abc5a626438b4d0b54f563' ...

* commit 'f5fa03660db16f9d78abc5a626438b4d0b54f563':
  vble: Do not abort decoding when version is not 1
  lavr: do not pass consumed samples as a parameter to ff_audio_resample()
  lavr: correct the documentation for the ff_audio_resample() return value
  lavr: do not pass sample count as a parameter to ff_audio_convert()
  x86: h264_weight: port to cpuflags
  configure: Enable avconv filter dependencies automatically

Conflicts:
	configure
	libavcodec/x86/h264_weight.asm

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

2012-11-28 13:27:18 +01:00

..

arm

Merge remote-tracking branch 'qatar/master'

2012-09-14 14:13:38 +02:00

x86

Merge remote-tracking branch 'qatar/master'

2012-11-18 13:35:15 +01:00

audio_convert.c

lavr: do not pass sample count as a parameter to ff_audio_convert()

2012-11-27 16:49:18 -05:00

audio_convert.h

lavr: do not pass sample count as a parameter to ff_audio_convert()

2012-11-27 16:49:18 -05:00

audio_data.c

lavr: change the type of the data buffers to uint8_t**.

2012-10-05 13:49:44 +02:00

audio_data.h

lavr: change the type of the data buffers to uint8_t**.

2012-10-05 13:49:44 +02:00

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

lavr: change the type of the data buffers to uint8_t**.

2012-10-05 13:49:44 +02:00

avresample.h

Include libavutil/channel_layout.h instead of libavutil/audioconvert.h

2012-11-11 13:35:12 -05: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

lavr: do not pass consumed samples as a parameter to ff_audio_resample()

2012-11-27 16:49:19 -05:00

resample.h

lavr: do not pass consumed samples as a parameter to ff_audio_resample()

2012-11-27 16:49:19 -05:00

utils.c

Merge commit 'f5fa03660db16f9d78abc5a626438b4d0b54f563'

2012-11-28 13:27:18 +01:00

version.h

lavr: bump major to 1 and declare it stable.

2012-10-05 13:50:13 +02:00