eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-01-06 06:05:32 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
743973f56f94e12c9153c06b17fb59cac7ccda39
ffmpeg/tests/videogen.c
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.5 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink