summaryrefslogtreecommitdiff
AgeCommit messageAuthorFilesLines
2012-08-07Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'Michael Niedermayer672-4320/+4730
2012-08-07Replace all CODEC_ID_* with AV_CODEC_ID_*Anton Khirnov582-3512/+3512
2012-01-17Merge remote-tracking branch 'qatar/master'Michael Niedermayer25-737/+1588
2012-01-16avformat: split out common SMJPEG codePaul B Mahol4-154/+229
2011-12-29Merge remote-tracking branch 'qatar/master'Michael Niedermayer14-22/+1406
2011-12-28avformat: Add SMJPEG demuxer.Paul B Mahol6-1/+193
2011-12-22lavf: Add SMJPEG demuxer.Paul B Mahol6-1/+188