Merge commit 'e4dc1000d7bbbcb5b45cf9849fc5315f19578e37'
[ffmpeg.git] / libavformat / smjpeg.c
2012-08-07 Michael NiedermayerMerge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'
2012-08-07 Anton KhirnovReplace all CODEC_ID_* with AV_CODEC_ID_*
2012-01-17 Michael NiedermayerMerge remote-tracking branch 'qatar/master'
2012-01-16 Paul B Maholavformat: split out common SMJPEG code
2011-12-29 Michael NiedermayerMerge remote-tracking branch 'qatar/master'
2011-12-28 Paul B Maholavformat: Add SMJPEG demuxer.
2011-12-22 Paul B Mahollavf: Add SMJPEG demuxer.