Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 25 Apr 2012 20:01:59 +0000 (22:01 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 25 Apr 2012 21:17:41 +0000 (23:17 +0200)
commit3ead79eaa3f77451bc93cb842ed7b38c94858045
tree4c90cceb47c62f96eaa518cd9ad109b539e9f1ad
parentcab15f9db4ba6e390b25dd80d7305bb51b5583c4
parent394dbde5484507f213768019623d016196ddad5f
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>
12 files changed:
Changelog
Makefile
cmdutils.c
common.mak
configure
doc/APIchanges
ffmpeg.c
libavresample/utils.c
libavutil/x86/x86util.asm
tests/fate/aac.mak
tests/lavf-regression.sh
tests/ref/lavf/dv_fmt