* commit 'd9ebb00d':
  svq3: remove a pointless if()
  h264: remove a pointless if()

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