-
Michael Niedermayer authored
* commit '2a41826b': lavc: add HEVC profiles names Conflicts: libavcodec/hevc.c libavcodec/version.h See: fb7d70c1Merged-by: Michael Niedermayer <michaelni@gmx.at>
d6b7ea06
* commit '2a41826b': lavc: add HEVC profiles names Conflicts: libavcodec/hevc.c libavcodec/version.h See: fb7d70c1Merged-by: Michael Niedermayer <michaelni@gmx.at>