aboutsummaryrefslogtreecommitdiffstats
path: root/libswresample
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-11-01 10:20:20 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-11-01 10:20:20 +0100
commitffe33500983983946048def3a6047920d97d957b (patch)
treeaf118d7e0ca3491233ddcf201b8a8beee2fb8f4d /libswresample
parentec5e02d49573975ee4bc73be173a2fad76d808ff (diff)
parentee80cf741a44115758e62399b7bde08d33161151 (diff)
downloadffmpeg-ffe33500983983946048def3a6047920d97d957b.tar.gz
Merge commit 'ee80cf741a44115758e62399b7bde08d33161151'
* commit 'ee80cf741a44115758e62399b7bde08d33161151': avfilter: x86: K&R formatting cosmetics Conflicts: libavfilter/x86/vf_gradfun_init.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample')
0 files changed, 0 insertions, 0 deletions