Merge commit 'e72e8c5a1df61447ac7af750531e96e8b62d02ba'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 27 Jan 2015 13:12:53 +0000 (14:12 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 27 Jan 2015 13:13:18 +0000 (14:13 +0100)
commit4e40e6128769246ee101e1990be42880a07dda18
tree2727d0126d551e007881af6f8b0b63e8fa2afc5d
parent2b5fa0e0be1195926e5e83302a1680c3c28e055a
parente72e8c5a1df61447ac7af750531e96e8b62d02ba
Merge commit 'e72e8c5a1df61447ac7af750531e96e8b62d02ba'

* commit 'e72e8c5a1df61447ac7af750531e96e8b62d02ba':
  hevc: add hwaccel hooks

Conflicts:
libavcodec/hevc.c
libavcodec/hevc_refs.c

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