aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter/x86
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-03-06 23:39:52 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-03-06 23:39:52 +0100
commit09131ebb562472effd81726c2c14c3ec7164b695 (patch)
tree07efcaec7b959e1900a2e821e0b0efccfd860cd6 /libavfilter/x86
parentbe493ca2a8c4e3a1c147f172cd6ace8673d36f84 (diff)
parenta2ad554def214d2d03b7c16f68dc081a8622f9ca (diff)
downloadffmpeg-09131ebb562472effd81726c2c14c3ec7164b695.tar.gz
Merge commit 'a2ad554def214d2d03b7c16f68dc081a8622f9ca'
* commit 'a2ad554def214d2d03b7c16f68dc081a8622f9ca': shorten: K&R formatting cosmetics Conflicts: libavcodec/shorten.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/x86')
0 files changed, 0 insertions, 0 deletions