mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-01-19 05:49:09 +02:00
67732b9d62
* 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>