I would like to suggest the following rename: libavcodec/i386/ --> libavcodec/x86/ This is in line with the directory names in libavutil and makes sense as the i386 subdir now also contains amd64-specific code. This would also allow me to perform some more build system trickery, like checking headers in arch subdirectories. Diego