* commit '5d839778':
  lavu: Refactor side data wiping

Conflicts:
	libavutil/frame.c

See: a400edbb
Merged-by: Michael Niedermayer <michaelni@gmx.at>