Michael Niedermayer f657ca0d0b Merge commit 'd8798276b65543d921adadf63cc7f5ba2d1604af' ...

* commit 'd8798276b65543d921adadf63cc7f5ba2d1604af':
  r3d: Add more input value validation

Conflicts:
	libavformat/r3d.c

See: 99b1b2b1c6
See: df92ac1852
Merged-by: Michael Niedermayer <michaelni@gmx.at>

2013-09-20 15:14:31 +02:00

11 KiB

Raw Blame History

View Raw