mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-05-13 21:26:33 +02: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>