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

Merge commit '9cfa21c8' 


* commit '9cfa21c8':
  swscale: support endianness conversion for AV_PIX_FMT_XYZ12

Conflicts:
	libswscale/swscale_unscaled.c
	libswscale/utils.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 2060d944 9cfa21c8
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 2 deletions
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