diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-13 16:39:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-13 16:39:42 +0200 |
| commit | 15ef1cfe6431179fb1cd5707b360a7d6d6bdb9d9 (patch) | |
| tree | 9a5c513d65689913fbbe2abb5be0e7ba6d6afa5e /libavformat/asf.c | |
| parent | 6571833d1a54a0be996481970de09487aa5a55d9 (diff) | |
| parent | f5962229bfcb14c2879e69ccdf7f1a4934168609 (diff) | |
| download | ffmpeg-15ef1cfe6431179fb1cd5707b360a7d6d6bdb9d9.tar.gz | |
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>
Diffstat (limited to 'libavformat/asf.c')
0 files changed, 0 insertions, 0 deletions