Merge remote-tracking branch 'qatar/master'
* qatar/master:
FATE: use updated reference for aac-latm_stereo_to_51
avconv: use libavresample
Add libavresample
FATE: avoid channel mixing in lavf-dv_fmt
Conflicts:
Changelog
Makefile
cmdutils.c
configure
doc/APIchanges
ffmpeg.c
tests/lavf-regression.sh
tests/ref/lavf/dv_fmt
tests/ref/seek/lavf_dv
Merged-by:
Michael Niedermayer <michaelni@gmx.at>
Showing
- Changelog 1 addition, 0 deletionsChangelog
- Makefile 1 addition, 0 deletionsMakefile
- cmdutils.c 4 additions, 1 deletioncmdutils.c
- common.mak 1 addition, 1 deletioncommon.mak
- configure 5 additions, 0 deletionsconfigure
- doc/APIchanges 4 additions, 0 deletionsdoc/APIchanges
- ffmpeg.c 35 additions, 20 deletionsffmpeg.c
- libavresample/Makefile 15 additions, 0 deletionslibavresample/Makefile
- libavresample/audio_convert.c 334 additions, 0 deletionslibavresample/audio_convert.c
- libavresample/audio_convert.h 87 additions, 0 deletionslibavresample/audio_convert.h
- libavresample/audio_data.c 345 additions, 0 deletionslibavresample/audio_data.c
- libavresample/audio_data.h 173 additions, 0 deletionslibavresample/audio_data.h
- libavresample/audio_mix.c 356 additions, 0 deletionslibavresample/audio_mix.c
- libavresample/audio_mix.h 108 additions, 0 deletionslibavresample/audio_mix.h
- libavresample/audio_mix_matrix.c 346 additions, 0 deletionslibavresample/audio_mix_matrix.c
- libavresample/avresample-test.c 340 additions, 0 deletionslibavresample/avresample-test.c
- libavresample/avresample.h 283 additions, 0 deletionslibavresample/avresample.h
- libavresample/internal.h 75 additions, 0 deletionslibavresample/internal.h
- libavresample/libavresample.v 4 additions, 0 deletionslibavresample/libavresample.v
- libavresample/options.c 89 additions, 0 deletionslibavresample/options.c
Loading
Please register or sign in to comment