aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter/af_amerge.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-09-22 11:51:18 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-09-22 11:51:38 +0200
commit361bc707319d4c4f121cf5841602b073f4ec2388 (patch)
tree76ce65eaf8eb6d352f9110dee73225d60ee62293 /libavfilter/af_amerge.c
parent85f8a3cb50c3950acc8d9854880cf620c60667a5 (diff)
parent08fa828b3fe242038c12df3e145e2c571e697d13 (diff)
downloadffmpeg-361bc707319d4c4f121cf5841602b073f4ec2388.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: avutil: Fix compilation with inline asm disabled on mingw Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/af_amerge.c')
0 files changed, 0 insertions, 0 deletions