Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 10 Dec 2012 01:13:26 +0000 (02:13 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 10 Dec 2012 01:16:33 +0000 (02:16 +0100)
commit529d3e002642a9901ae463dea0263768dc843173
treee022885e2b9c1cee95c30aa2ed53a2ab56831f01
parenta93369845783a5a63e713c143cab2c550a6ccd82
parent2dd95bd7cfd1acbbac8844739572667f40314b79
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  dsputil: remove unused macro WRAPPER8_16
  configure: fix automatic processing of _extralibs in check_deps
  libvpxenc: Support forcing keyframes
  ac3dec: decode directly into output buffers

Conflicts:
libavcodec/ac3dec.c
libavcodec/libvpxenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/ac3dec.c
libavcodec/dsputil.h
libavcodec/libvpxenc.c