* commit '43fd3dd8':
  h264: drop redundant initialization in init()

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