diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-09 23:40:59 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-09 23:41:02 +0100 |
commit | fb0023639ea5bc3071fbe5686125d5ff873950b0 (patch) | |
tree | 1e16405d074a54921e04b2a2105d3b68bc60675c /libavcodec/aacdectab.h | |
parent | 38aee6408a6732b8ac86341dabf6683c08caa1c1 (diff) | |
parent | 558b20d729bc296d8e6a69f03cd509ad26a4827d (diff) | |
download | ffmpeg-fb0023639ea5bc3071fbe5686125d5ff873950b0.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
matroskaenc: enable Annex B to MP4 conversion for HEVC tracks.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/aacdectab.h')
0 files changed, 0 insertions, 0 deletions