Merge commit '9301486408a480629336af4d7fd873c0f28fb2d5'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 28 Aug 2014 20:23:01 +0000 (22:23 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 28 Aug 2014 20:23:01 +0000 (22:23 +0200)
commitf30a8154abf2905b61b08974bc71f04e8d7afc68
tree2c487d535bd7955a2c1e598a4409142790d8230e
parent56cc754c76d3aba81e121502d0d420242b7023b1
parent9301486408a480629336af4d7fd873c0f28fb2d5
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>
doc/APIchanges
libavcodec/avcodec.h
libavcodec/utils.c
libavcodec/version.h
libavformat/dump.c