Merge commit '722554788b77c13748e83458f626a9ac38b70072'
* commit '722554788b77c13748e83458f626a9ac38b70072': Add raw HEVC muxer Conflicts: libavformat/version.h See: ef5d32b9c5313a1e4491d7f647deae5cb76ca4b0 Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
ffe987b96d