fix errors in previous avutil include logic

@ace13 kindly pointed out and issue with d75391de. I missed the bit
about file with the layout definitions being renamed a while after the
same definitions were removed from libavcodec, which meant building was
still broken with ffmpeg-1.0.* (but not libav).

This commit fixes this.