Merge commit 'e50f5d3cf9ef9a16982a5cb4d8b1916cd963aa5b'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 27 Mar 2014 00:10:28 +0000 (01:10 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 27 Mar 2014 00:10:28 +0000 (01:10 +0100)
commit12ab07be447264b107b18bc49bb9e06be072330f
tree7efd220c82eba3dc7779839806ac5c1b080aa520
parent61b5ef7754132c43e6db1a273066e82c469fa39c
parente50f5d3cf9ef9a16982a5cb4d8b1916cd963aa5b
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@gmx.at>
Changelog
doc/general.texi
libavcodec/Makefile
libavcodec/aliaspixdec.c
libavcodec/aliaspixenc.c
libavcodec/allcodecs.c
libavcodec/avcodec.h
libavcodec/codec_desc.c
libavcodec/version.h
libavformat/img2.c
libavformat/img2enc.c