Michael Niedermayer d6b7ea06f1 Merge commit '2a41826bea3833895dc06939831b7f35ca1f597e' ...

* commit '2a41826bea3833895dc06939831b7f35ca1f597e':
  lavc: add HEVC profiles names

Conflicts:
	libavcodec/hevc.c
	libavcodec/version.h

See: fb7d70c1cd
Merged-by: Michael Niedermayer <michaelni@gmx.at>

2013-12-21 00:24:43 +01:00

68 KiB

Raw Blame History

View Raw