Michael Niedermayer 8d07bbca63 Merge commit 'f322b2073581119de5da74f92a03309a36891cfa' ...

* commit 'f322b2073581119de5da74f92a03309a36891cfa':
  lavr: only save/restore the mixing matrix if mixing is being done
  rtpdec_vp8: Cosmetics: Fix bad alignment/indentation
  rtpenc: Allow including a SDES/CNAME block in RTCP SR packets

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

2012-12-17 14:06:11 +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: temporarily store custom matrix in AVAudioResampleContext

2012-12-11 14:00:32 -05:00

audio_mix.c

lavr: move AudioMix struct definition to audio_mix.c

2012-12-15 12:26:15 -05:00

audio_mix.h

lavr: move AudioMix struct definition to audio_mix.c

2012-12-15 12:26:15 -05: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

lavr: clarify documentation for avresample_get/set_matrix()

2012-12-11 14:00:32 -05:00

internal.h

lavr: temporarily store custom matrix in AVAudioResampleContext

2012-12-11 14:00:32 -05:00

libavresample.v

…

Makefile

…

options.c

lavr: temporarily store custom matrix in AVAudioResampleContext

2012-12-11 14:00:32 -05:00

resample_template.c

…

resample.c

lavr: only save/restore the mixing matrix if mixing is being done

2012-12-16 19:26:17 -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 remote-tracking branch 'qatar/master'

2012-12-12 10:50:21 +01:00

version.h

lavr: bump major to 1 and declare it stable.

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