Merge commit 'eb335f3c5ce37f2b93c993e28404d113bee843bc'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 17 Nov 2014 11:07:49 +0000 (12:07 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 17 Nov 2014 11:07:49 +0000 (12:07 +0100)
commit0d5af820f7be073963f270e4387938f199e1facf
tree45e11e9d72d95bb694ca9803a27ee05fdc3b78c8
parentc23d7de22ec0c14ad35d40c9073451c64a5ce74d
parenteb335f3c5ce37f2b93c993e28404d113bee843bc
Merge commit 'eb335f3c5ce37f2b93c993e28404d113bee843bc'

* commit 'eb335f3c5ce37f2b93c993e28404d113bee843bc':
  hevc: reduce variable scope

Conflicts:
libavcodec/hevc.c

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