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)
* commit '9a6a7109985cbd3a20707b40cc31ed53a174195c':
  matroskaenc: enable Annex B to MP4 conversion for HEVC tracks.

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

Simple merge