Merge commit '86bfcfcf2364bc837b7bb582c66a8a15a332414f'
[ffmpeg.git] / libavcodec / proresdec.h
2012-09-07 Michael Niedermayerproresdec2: avoid VLA and use SliceContext instead.
2011-10-12 Elvis Presleyprores: change license to LGPL, merge some parts.