Merge commit '8b573ddda75980f724f779ff75aacc2ff81d9e0e'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 17 Nov 2014 11:24:38 +0000 (12:24 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 17 Nov 2014 11:26:36 +0000 (12:26 +0100)
* commit '8b573ddda75980f724f779ff75aacc2ff81d9e0e':
  hevc: remove superfluous assignments and checks

Conflicts:
libavcodec/hevc.c

See: 83976e40e89655162e5394cf8915d9b6d89702d9
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge