[FFmpeg-cvslog] Merge commit 'df949b645b12d62bb4da56d629a887c81f67f2e5'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jul  3 13:15:33 2014 +0200| [982920cfaa40d5b575225fc2baaf03f6250f7a03] | committer: Michael Niedermayer

Merge commit 'df949b645b12d62bb4da56d629a887c81f67f2e5'

* commit 'df949b645b12d62bb4da56d629a887c81f67f2e5':
  hevc: Use the local context variable when needed

Conflicts:
	libavcodec/hevc.c

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

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