Backport FFmpeg pkg-config patch from HEAD to r12920