Michael Niedermayer 5b1a953960 Merge commit '8231764784a405f546e9c427a6de22d3f4de5c35' into release/2.2 ...

* commit '8231764784a405f546e9c427a6de22d3f4de5c35':
  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-23 02:16:10 +02:00

38 KiB

Raw Blame History

View Raw