372ea28f68
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 321e85e176)
Conflicts:
libswscale/swscale.c
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>