Merge commit 'c88c5eef53ff1619724ba47b722da64ec0593dab'
authorMichael Niedermayer <michael@niedermayer.cc>
Wed, 15 Jul 2015 19:21:40 +0000 (21:21 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Wed, 15 Jul 2015 19:21:40 +0000 (21:21 +0200)
commit4e160ecdbc0561068f2e690f8e9ec714e28497d0
tree55f0dd8ad48c8212b28ed05b735385557242702f
parent269a71b68ae7b026dfb764681f45d754f29f7aa2
parentc88c5eef53ff1619724ba47b722da64ec0593dab
Merge commit 'c88c5eef53ff1619724ba47b722da64ec0593dab'

* commit 'c88c5eef53ff1619724ba47b722da64ec0593dab':
  hevc: Split the struct setup from the pps parsing

Conflicts:
libavcodec/hevc_ps.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/hevc_ps.c