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

Merge commit 'e50f5d3c' 


* commit 'e50f5d3c':
  Alias PIX image encoder and decoder

Conflicts:
	Changelog
	libavcodec/allcodecs.c
	libavcodec/version.h
	libavformat/img2enc.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 61b5ef77 e50f5d3c
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 279 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