Michael Niedermayer 9411e9cafb Merge commit 'd719981273bc779c7d1e879d88404fd867f93a0e' ...

* commit 'd719981273bc779c7d1e879d88404fd867f93a0e':
  4xm: Check that the read track value is non-negative

Conflicts:
	libavformat/4xm.c

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

2013-09-04 12:20:53 +02:00

12 KiB

Raw Blame History

View Raw