[FFmpeg-cvslog] Merge commit 'ec217218c27d53c5b323323e6ef862bcdbcabe5f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Sep  9 19:08:08 2014 +0200| [d2f1f2c74f2d40ad21b99302770e356c40162be2] | committer: Michael Niedermayer

Merge commit 'ec217218c27d53c5b323323e6ef862bcdbcabe5f'

* commit 'ec217218c27d53c5b323323e6ef862bcdbcabe5f':
  x86inc: Free up variable name "n" in global namespace

See: a4dbabc8b3c123c071c925d2d749a50e4895ebcd
Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d2f1f2c74f2d40ad21b99302770e356c40162be2
---