Commit 4e160ecd authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'c88c5eef'

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

Conflicts:
	libavcodec/hevc_ps.c
Merged-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parents 269a71b6 c88c5eef
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment