Merge commit '959bea13ce3498a5bddf8a415a061a7bb5a8b075'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Nov 2013 16:57:57 +0000 (17:57 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Nov 2013 16:57:57 +0000 (17:57 +0100)
commit0fbeeb939915b69050d00feab93aa904d133ec5f
tree410d9d0778c11108f4851655611c55753a4c711b
parent3a0c90263605f5cd7992e40d5b91a418621f623f
parent959bea13ce3498a5bddf8a415a061a7bb5a8b075
Merge commit '959bea13ce3498a5bddf8a415a061a7bb5a8b075'

* commit '959bea13ce3498a5bddf8a415a061a7bb5a8b075':
  matroskadec: Support HEVC demuxing

Conflicts:
Changelog
libavformat/matroskadec.c
libavformat/version.h

See: 16b6839de6767924c4640d6e9204b6eeb5c53910
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Changelog
libavformat/matroskadec.c
libavformat/version.h