[FFmpeg-cvslog] Merge commit 'e50f5d3cf9ef9a16982a5cb4d8b1916cd963aa5b'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Mar 27 01:10:28 2014 +0100| [12ab07be447264b107b18bc49bb9e06be072330f] | committer: Michael Niedermayer

Merge commit 'e50f5d3cf9ef9a16982a5cb4d8b1916cd963aa5b'

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

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

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=12ab07be447264b107b18bc49bb9e06be072330f
---