* commit 'd161ae0a':
  frame: add a function for removing side data from a frame

Conflicts:
	libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>