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

Merge commit '737d35e3' 


* commit '737d35e3':
  vdpau: add support for the H.264 High 4:4:4 Predictive profile

Conflicts:
	libavcodec/vdpau_internal.h

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents a6ab9ed5 737d35e3
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