Merge commit 'd2438969'
* commit 'd2438969': ffv1: fix calculating slice dimensions for version 2 Conflicts: libavcodec/ffv1dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Showing
Please
register
or
sign in
to comment
* commit 'd2438969': ffv1: fix calculating slice dimensions for version 2 Conflicts: libavcodec/ffv1dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>