Michael Niedermayer a8e963835a Merge commit 'b5a138652ff8a5b987d3e1191e67fd9f6575527e' ...

* commit 'b5a138652ff8a5b987d3e1191e67fd9f6575527e':
  Give less generic names to global library option arrays

Conflicts:
	libavcodec/options_table.h
	libavfilter/avfilter.c
	libavformat/options_table.h
	libswscale/options.c

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

2013-08-03 09:16:36 +02:00

..

arm

…

x86

Merge remote-tracking branch 'qatar/master'

2013-07-18 09:53:47 +02:00

audio_convert.c

…

audio_convert.h

…

audio_data.c

…

audio_data.h

…

audio_mix_matrix.c

…

audio_mix.c

avresample: Add av_cold attributes to init functions missing them

2013-05-04 21:10:05 +02:00

audio_mix.h

…

avresample-test.c

miscellaneous typo fixes

2013-07-25 19:43:32 +02:00

avresample.h

…

dither.c

avresample: Add av_cold attributes to init functions missing them

2013-05-04 21:10:05 +02:00

dither.h

…

internal.h

…

libavresample.v

…

Makefile

…

options.c

Give less generic names to global library option arrays

2013-08-02 19:19:02 +02:00

resample_template.c

…

resample.c

…

resample.h

…

utils.c

…

version.h

lavr doxy: add version.h to the lavr group

2013-05-17 20:27:48 +02:00