-
Michael Niedermayer authored
* commit 'c88c5eef': hevc: Split the struct setup from the pps parsing Conflicts: libavcodec/hevc_ps.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4e160ecd
* commit 'c88c5eef': hevc: Split the struct setup from the pps parsing Conflicts: libavcodec/hevc_ps.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>