mirror of https://github.com/FFmpeg/FFmpeg.git
* commit 'd243896987b8b2062d1faba4d8d6f0c62d2dbee9': ffv1: fix calculating slice dimensions for version 2 Conflicts: libavcodec/ffv1dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>pull/12/merge
commit
f506ae19ff