Merge commit 'daaef403d122b35d87b27d6b369d287b1ed06973' into release/2.2
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 23 Mar 2014 02:14:03 +0000 (03:14 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 23 Mar 2014 02:14:03 +0000 (03:14 +0100)
commitd130fae51948a2baf69dcf29fdb15f80ea2bc363
treef2cbbcc131a41abdcb3178e84ba6df873dc242c4
parentdde996bf999a2b4ec155e78a7b6b1cd66830fb9d
parentdaaef403d122b35d87b27d6b369d287b1ed06973
Merge commit 'daaef403d122b35d87b27d6b369d287b1ed06973' into release/2.2

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

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