Merge commit 'a823d0948683bd97dd58556b5740e434166209a8'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 9 Mar 2014 22:34:09 +0000 (23:34 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 9 Mar 2014 22:34:17 +0000 (23:34 +0100)
commit38aee6408a6732b8ac86341dabf6683c08caa1c1
tree90fa9045b65094f6c450b609e04b7cc6bfa9bf57
parent88c8e4afeaf74ee58b67145e0331e229d8050968
parenta823d0948683bd97dd58556b5740e434166209a8
Merge commit 'a823d0948683bd97dd58556b5740e434166209a8'

* commit 'a823d0948683bd97dd58556b5740e434166209a8':
  matroskaenc: write private data in hvcC format for HEVC.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/Makefile
libavformat/matroskaenc.c