ffmpeg/libavresample
Michael Niedermayer a57ece0cb4 Merge commit '1985c2e75c607ac51bfd8dc87d2957a5edf2b6f8'
* commit '1985c2e75c607ac51bfd8dc87d2957a5edf2b6f8':
  Bump major versions of all libraries.

Conflicts:
	doc/APIchanges
	libavcodec/version.h
	libavdevice/version.h
	libavfilter/version.h
	libavformat/version.h
	libavutil/version.h
	libswscale/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-10 00:26:45 +02:00
..
aarch64
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
avresampleres.rc
dither.c
dither.h
internal.h
libavresample.v
Makefile
options.c
resample_template.c
resample.c
resample.h
utils.c
version.h Merge commit '1985c2e75c607ac51bfd8dc87d2957a5edf2b6f8' 2014-08-10 00:26:45 +02:00