Merge commit 'f5962229bfcb14c2879e69ccdf7f1a4934168609'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 13 Oct 2012 14:39:42 +0000 (16:39 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 13 Oct 2012 14:39:42 +0000 (16:39 +0200)
commit15ef1cfe6431179fb1cd5707b360a7d6d6bdb9d9
tree9a5c513d65689913fbbe2abb5be0e7ba6d6afa5e
parent6571833d1a54a0be996481970de09487aa5a55d9
parentf5962229bfcb14c2879e69ccdf7f1a4934168609
Merge commit 'f5962229bfcb14c2879e69ccdf7f1a4934168609'

* commit 'f5962229bfcb14c2879e69ccdf7f1a4934168609':
  avplay: use audio parameters from the decoded frame instead of AVCodecContext
  dca: allocate a secondary buffer for extra channels when downmixing
  configure: use utilities from /usr/xpg4/bin if it exists
  avstring-test: fix memory leaks

Conflicts:
ffplay.c
libavcodec/dcadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
configure
libavcodec/dcadec.c
libavutil/avstring.c