Merge commit '7fa72700298107fe756311ecb4dee5270ff12d35' into release/0.10
[ffmpeg.git] / libavformat / smjpegenc.c
2012-01-17 Michael NiedermayerMerge remote-tracking branch 'qatar/master'
2012-01-16 Paul B Maholadd SMJPEG muxer