* commit 'd48430c3':
  build: Let the SVQ3 decoder depend on the H.264 decoder

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