* commit '52f954da':
  libavcodec: Unconditionally build xiph.o

Conflicts:
	libavcodec/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>