aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/img2enc.c
Commit message (Expand)AuthorAgeFilesLines
* Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'Michael Niedermayer2012-08-071-3/+3
|\
| * Replace all CODEC_ID_* with AV_CODEC_ID_*Anton Khirnov2012-08-071-5/+5
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-06-241-1/+2
|\|
| * image2: Add "start_number" private option to the muxerMashiat Sarker Shakkhar2012-06-241-2/+18
* | image2: Add "start_number" private option to the muxerMashiat Sarker Shakkhar2012-06-231-1/+1
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-181-1/+1
|\|
| * avcodec: add XBM encoderPaul B Mahol2012-03-171-1/+1
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-02-231-12/+36
|/
* img2: split muxer and demuxer into separate filesPaul B Mahol2012-02-221-0/+151