* commit '7e244c68':
  avframe: add codec-independent stereoscopic metadata

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