Merge remote-tracking branch 'qatar/master'
[ffmpeg.git] / libavcodec / mss3.c
2012-07-02 Michael NiedermayerMerge remote-tracking branch 'qatar/master'
2012-07-02 Kostya ShishkovMS ATC Screen (aka MSS3) decoder