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

Merge commit 'c1eb3e7f' 


* commit 'c1eb3e7f':
  swscale: add support for endianness only conversion

Conflicts:
	libswscale/utils.c
	libswscale/version.h

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 60fd8805 c1eb3e7f
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