[FFmpeg-cvslog] Merge commit '9301486408a480629336af4d7fd873c0f28fb2d5'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Aug 28 22:23:01 2014 +0200| [f30a8154abf2905b61b08974bc71f04e8d7afc68] | committer: Michael Niedermayer

Merge commit '9301486408a480629336af4d7fd873c0f28fb2d5'

* 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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f30a8154abf2905b61b08974bc71f04e8d7afc68
---