aboutsummaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-05-01 10:16:27 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-05-01 10:16:31 +0200
commite41d3aba0123c1089b55aa7dc6371973a0c3a39e (patch)
tree5b17e7bf6fd3d7103e99cc9296de1b9070bd04c3 /.gitignore
parenta1b88797144111262b07cde42b038387a3c6578b (diff)
parentc22263d3e813d442df8fa5f5ba8993573fe775d8 (diff)
downloadffmpeg-e41d3aba0123c1089b55aa7dc6371973a0c3a39e.tar.gz
Merge commit 'c22263d3e813d442df8fa5f5ba8993573fe775d8'
* commit 'c22263d3e813d442df8fa5f5ba8993573fe775d8': graphparser: only print filter arguments if they are non-NULL af_channelmap: ensure the output channel layout is valid. Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions