Merge commit '588a5619da0d041e55b365f63d0fa9c72bdbd4d3'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sat, 26 Sep 2015 09:11:06 +0000 (11:11 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sat, 26 Sep 2015 09:11:06 +0000 (11:11 +0200)
commitd0aec0aae872d00402e6d81d0884ddbcb657c087
treee897f26e8b497c3639b37cea4d43d978c0be76fe
parent2b61cc44433e47c98ec3336bea14f69fdfc9c616
parent588a5619da0d041e55b365f63d0fa9c72bdbd4d3
Merge commit '588a5619da0d041e55b365f63d0fa9c72bdbd4d3'

* commit '588a5619da0d041e55b365f63d0fa9c72bdbd4d3':
  dxv: Parse ancillary encoder information

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavcodec/dxv.c