* commit '85deb51a':
  h264: Only initialize dsputil if error resilience is enabled

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