diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-16 14:17:41 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-16 14:18:01 +0100 |
commit | c198af648a2ab800abe9259f420a4b38059c3f18 (patch) | |
tree | a93788af459c3d4cae10367f257cfa89631ca476 /libavformat/act.c | |
parent | cd0982e1899d24df4f1989ed857de5e477c64763 (diff) | |
parent | e843612695007cc623813073754c651ab43021f7 (diff) | |
download | ffmpeg-c198af648a2ab800abe9259f420a4b38059c3f18.tar.gz |
Merge commit 'e843612695007cc623813073754c651ab43021f7'
* commit 'e843612695007cc623813073754c651ab43021f7':
af_channelmap: fix ONE_STR mapping mode
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/act.c')
0 files changed, 0 insertions, 0 deletions