Michael Niedermayer f30a8154ab 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@gmx.at>

2014-08-28 22:23:01 +02:00

82 KiB

Raw Blame History

View Raw