Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit c4c6aea3)

Conflicts:

	libavcodec/proresdec2.c