mirror of
https://github.com/nyanmisaka/ffmpeg-rockchip.git
synced 2025-10-13 04:24:49 +08: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>