* commit 'ca1e36a8':
  h264: fix build when error resilience is disabled

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