aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/aliaspixdec.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'e50f5d3cf9ef9a16982a5cb4d8b1916cd963aa5b'Michael Niedermayer2014-03-271-4/+4
| | | | | | | | | | | | | * 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>
* Alias PIX image encoder and decoderVittorio Giovara2014-03-261-0/+128