* commit 'c23c96b6':
  lavf: add av_stream_get_side_data

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