* commit '9301486408a480629336af4d7fd873c0f28fb2d5': avcodec: add stream-level stereo3d side data Conflicts: doc/APIchanges libavcodec/avcodec.h libavcodec/utils.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>