Michael Niedermayer 113229922a Merge commit 'da7d839a0d3ec40423a665dc85e0cfaed3f92eb8' ...

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

Conflicts:
	libavcodec/ffv1dec.c

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

2014-08-12 17:09:39 +02:00

39 KiB

Raw Blame History

View Raw