[FFmpeg-cvslog] Merge commit '2de887e45b664f44b51686f5979fa8ce6dfe2ec2'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Feb 18 20:25:41 2015 +0100| [00acf38379d333d3d20de7b70390eeae0f323512] | committer: Michael Niedermayer

Merge commit '2de887e45b664f44b51686f5979fa8ce6dfe2ec2'

* commit '2de887e45b664f44b51686f5979fa8ce6dfe2ec2':
  libx265: Reduce the scope of some variables

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

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