wrapper/FFmpeg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
62575 commits 40 branches 405 tags 230 MiB
Commit graph

2 commits

Author SHA1 Message Date
Michael Niedermayer
12ab07be44 Merge commit 'e50f5d3cf9' 
* commit 'e50f5d3cf9':
  Alias PIX image encoder and decoder

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-27 01:10:28 +01:00
Vittorio Giovara
e50f5d3cf9 Alias PIX image encoder and decoder 2014-03-26 23:25:02 +01:00