Merge remote-tracking branch 'qatar/master'
[ffmpeg.git] / libavcodec / proresdec2.c
2011-10-14 Michael Niedermayerproresdec: rename to avoid confusion