* commit 'cf6090dc':
  hevc: use intreadwrite

Conflicts:
	libavcodec/hevc_mvs.c

See: 7a4a5515Merged-by: Michael Niedermayer <michaelni@gmx.at>