ffmpeg/libavresample
Michael Niedermayer 8ac0d95bd3 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  h264: avoid pointless copying of ref lists
  lavr: always reset mix function names and pointers in mix_function_init()
  lavr: call mix_function_init() in ff_audio_mix_set_matrix()
  fate: update ref after rv30_loop_filter fix
  rv30: fix masking in rv30_loop_filter()

Conflicts:
	tests/ref/fate/filter-delogo
	tests/ref/fate/rv30

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-18 13:54:38 +01:00
..
arm
x86
audio_convert.c
audio_convert.h
audio_data.c
audio_data.h
audio_mix_matrix.c
audio_mix.c
audio_mix.h
avresample-test.c
avresample.h
dither.c
dither.h
internal.h
libavresample.v
Makefile
options.c
resample_template.c
resample.c
resample.h
utils.c
version.h