Merge commit '9a6a7109985cbd3a20707b40cc31ed53a174195c' into release/2.2
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 23 Mar 2014 02:20:00 +0000 (03:20 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 23 Mar 2014 02:20:00 +0000 (03:20 +0100)
commit49f11e12d5afa9cd800f3e2f753d83595d5cff5c
tree173dde1f8a794dabad4375c708337ad4f37cb9b3
parentd130fae51948a2baf69dcf29fdb15f80ea2bc363
parent9a6a7109985cbd3a20707b40cc31ed53a174195c
Merge commit '9a6a7109985cbd3a20707b40cc31ed53a174195c' into release/2.2

* commit '9a6a7109985cbd3a20707b40cc31ed53a174195c':
  matroskaenc: enable Annex B to MP4 conversion for HEVC tracks.

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