[FFmpeg-cvslog] Merge commit 'eb335f3c5ce37f2b93c993e28404d113bee843bc'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Nov 17 12:07:49 2014 +0100| [0d5af820f7be073963f270e4387938f199e1facf] | committer: Michael Niedermayer

Merge commit 'eb335f3c5ce37f2b93c993e28404d113bee843bc'

* commit 'eb335f3c5ce37f2b93c993e28404d113bee843bc':
  hevc: reduce variable scope

Conflicts:
	libavcodec/hevc.c

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

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