Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'e50f5d3cf9ef9a16982a5cb4d8b1916cd963aa5b' | Michael Niedermayer | 2014-03-27 | 1 | -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 decoder | Vittorio Giovara | 2014-03-26 | 1 | -0/+128 |