aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/smjpeg.c
Commit message (Expand)AuthorAgeFilesLines
* Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'Michael Niedermayer2012-08-071-5/+5
|\
| * Replace all CODEC_ID_* with AV_CODEC_ID_*Anton Khirnov2012-08-071-5/+5
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-171-153/+6
|\|
| * avformat: split out common SMJPEG codePaul B Mahol2012-01-161-153/+6
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-12-291-7/+11
|\|
| * avformat: Add SMJPEG demuxer.Paul B Mahol2011-12-281-0/+187
* lavf: Add SMJPEG demuxer.Paul B Mahol2011-12-221-0/+183