summaryrefslogtreecommitdiff
path: root/libavformat/img2enc.c
Commit message (Expand)AuthorAge
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-18
|\
| * avcodec: add XBM encoderPaul B Mahol2012-03-17
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-02-23
|/
* img2: split muxer and demuxer into separate filesPaul B Mahol2012-02-22