Merge commit '0c4468dc185fa8b9e7d6add914595c5e928b24fd'
authorClément Bœsch <clement@stupeflix.com>
Thu, 23 Jun 2016 10:38:51 +0000 (12:38 +0200)
committerClément Bœsch <clement@stupeflix.com>
Thu, 23 Jun 2016 10:38:51 +0000 (12:38 +0200)
commitabb3cc46d595dcb186ae30ec7339a56cd9803f45
tree6397a8cdb89841f13ef23c8f860fe5eac4c253ec
parent5954730ba35ca223e7ba520ade9d589e158c1ede
parent0c4468dc185fa8b9e7d6add914595c5e928b24fd
Merge commit '0c4468dc185fa8b9e7d6add914595c5e928b24fd'

* commit '0c4468dc185fa8b9e7d6add914595c5e928b24fd':
  stereo3d: Add API to get name from value or value from name

Merged-by: Clément Bœsch <clement@stupeflix.com>
doc/APIchanges
libavformat/dump.c
libavutil/stereo3d.c
libavutil/stereo3d.h
libavutil/version.h