* commit 'da7d839a':
  ffv1dec: check that global parameters do not change in version 0/1

Conflicts:
	libavcodec/ffv1dec.c

See: b05cd1eaMerged-by: Michael Niedermayer <michaelni@gmx.at>