1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-02 03:06:28 +02:00
FFmpeg/libavresample
Michael Niedermayer 5f8f9dc436 Merge commit '45235ac488363e3360bf2f2275102d1ec66eba0f'
* commit '45235ac488363e3360bf2f2275102d1ec66eba0f':
  configure: Move x11grab option to a more suitable place in the help output
  lavr: allow setting internal_sample_fmt option by string
  lavr: Add "resample_cutoff" option as a duplicate of "cutoff"

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-24 17:45:06 +01:00
..
arm
x86
audio_convert.c
audio_convert.h
audio_data.c
audio_data.h
audio_mix_matrix.c
audio_mix.c lavr: fix mixing matrix reduction when normalization is disabled 2013-02-12 13:41:13 -05:00
audio_mix.h
avresample-test.c
avresample.h
dither.c
dither.h
internal.h
libavresample.v
Makefile
options.c lavr: allow setting internal_sample_fmt option by string 2013-02-23 17:07:54 -05:00
resample_template.c
resample.c
resample.h
utils.c
version.h