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

Merge commit '1481d24c' 


* commit '1481d24c':
  RGBA64 pixel formats

Conflicts:
	doc/APIchanges
	libavutil/pixdesc.c
	libavutil/pixfmt.h
	libavutil/version.h
	libswscale/utils.c

See: 9569a3c9
See: 92afb431, as well as others
Note: the enum values added in libav are incompatible/different to what ffmpeg used since 3 years
Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents ad9a6e19 1481d24c
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