Merge commit 'df949b645b12d62bb4da56d629a887c81f67f2e5'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 3 Jul 2014 11:15:33 +0000 (13:15 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 3 Jul 2014 11:19:34 +0000 (13:19 +0200)
commit982920cfaa40d5b575225fc2baaf03f6250f7a03
tree98ce06e3942a271229166bbdad85278219bc15d2
parent33f6ba9c4e7bc5b2f06972f7e38dd35b31756dc9
parentdf949b645b12d62bb4da56d629a887c81f67f2e5
Merge commit 'df949b645b12d62bb4da56d629a887c81f67f2e5'

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

Conflicts:
libavcodec/hevc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/hevc.c