-
Michael Niedermayer authored
* commit 'b5d7b80a ': ffv1dec: check that global parameters do not change in version 0/1 Conflicts: libavcodec/ffv1.c Merged-by:
Michael Niedermayer <michaelni@gmx.at>
497d6612
* commit 'b5d7b80a ': ffv1dec: check that global parameters do not change in version 0/1 Conflicts: libavcodec/ffv1.c Merged-by:Michael Niedermayer <michaelni@gmx.at>