Merge commit '9752d07d33d5370f7819865fbb5e582b982aad06'
[ffmpeg.git] / libavcodec / tscc2data.h
2012-07-11 Michael NiedermayerMerge remote-tracking branch 'qatar/master'
2012-07-11 Kostya ShishkovTechSmith Screen Codec 2 decoder