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

Merge commit 'e96c3b81' 


* commit 'e96c3b81':
  avutil: rename AV_PIX_FMT_Y400A to AV_PIX_FMT_YA8

Conflicts:
	libavcodec/libopenjpegdec.c
	libavcodec/libopenjpegenc.c
	libavcodec/raw.c
	libavutil/pixdesc.c
	libavutil/pixfmt.h
	libavutil/version.h
	libswscale/swscale_internal.h
	libswscale/swscale_unscaled.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 0b25261d e96c3b81
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 30 additions and 21 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