]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 38aee64 558b20d)
Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 9 Mar 2014 22:40:59 +0000 (23:40 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 9 Mar 2014 22:41:02 +0000 (23:41 +0100)
* qatar/master:
  matroskaenc: enable Annex B to MP4 conversion for HEVC tracks.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/matroskaenc.c patch | diff1 | diff2 | blob | history

diff --cc libavformat/matroskaenc.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.