Michael Niedermayer 67732b9d62 Merge remote-tracking branch 'qatar/master' ...

* qatar/master:
  mpegts: Remove disabled extension matching probe.
  fate: avoid freopen(NULL) in videogen/rotozoom

Conflicts:
	tests/rotozoom.c
	tests/videogen.c

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

2012-06-07 21:45:52 +02:00

4.7 KiB

Raw Blame History

View Raw