[FFmpeg-cvslog] Merge commit 'f5962229bfcb14c2879e69ccdf7f1a4934168609'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Oct 13 16:39:42 2012 +0200| [15ef1cfe6431179fb1cd5707b360a7d6d6bdb9d9] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=15ef1cfe6431179fb1cd5707b360a7d6d6bdb9d9
---