Skip to content
Snippets Groups Projects
Commit d6b7ea06 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Merge commit '2a41826b' 


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

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

See: fb7d70c1
Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 6fc9f5e0 2a41826b
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment