aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter/vf_showinfo.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-09-09 19:08:08 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-09-09 19:08:32 +0200
commitd2f1f2c74f2d40ad21b99302770e356c40162be2 (patch)
tree4706c3e78a5046f13e80142b1f12cbbc0756e2b6 /libavfilter/vf_showinfo.c
parent87120217b53bf99153756016941e066047f25345 (diff)
parentec217218c27d53c5b323323e6ef862bcdbcabe5f (diff)
downloadffmpeg-d2f1f2c74f2d40ad21b99302770e356c40162be2.tar.gz
Merge commit 'ec217218c27d53c5b323323e6ef862bcdbcabe5f'
* commit 'ec217218c27d53c5b323323e6ef862bcdbcabe5f': x86inc: Free up variable name "n" in global namespace See: a4dbabc8b3c123c071c925d2d749a50e4895ebcd Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_showinfo.c')
0 files changed, 0 insertions, 0 deletions