* commit '3a149e23':
  hevc: Refactor decode_nal_sei_frame_packing_arrangement

Conflicts:
	libavcodec/hevc_sei.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>