Michael Niedermayer 15ef1cfe64 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>

2012-10-13 16:39:42 +02:00

5.6 KiB

Raw Blame History

View Raw