mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2026-01-11 08:35:27 +01:00
* commit '6516632967da5e6bd7d6136e8678f826669ed26e': tests: Only run noproxy test if networking is enabled fifo: K&R formatting cosmetics Conflicts: libavformat/Makefile libavutil/fifo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>