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)
* commit '588a5619da0d041e55b365f63d0fa9c72bdbd4d3':
  dxv: Parse ancillary encoder information

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

Simple merge