Merge commit '6bb8720f00e2e6209665f819fb351fd42b82d5d0'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 20 Feb 2014 00:50:26 +0000 (01:50 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 20 Feb 2014 00:50:26 +0000 (01:50 +0100)
commitf4c8d002231afbc181e97c512e459ec6860f7098
tree1e54b1287f49f89e3156284c40b5b87365c9a10a
parentca9f7e1832785414362bb8aeef1c7eb0a454d92e
parent6bb8720f00e2e6209665f819fb351fd42b82d5d0
Merge commit '6bb8720f00e2e6209665f819fb351fd42b82d5d0'

* commit '6bb8720f00e2e6209665f819fb351fd42b82d5d0':
  AVOptions: deprecate unused AV_OPT_FLAG_METADATA

Conflicts:
doc/APIchanges
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/APIchanges
libavutil/opt.h
libavutil/version.h