* commit '1115689d':
  svq3: Check for any negative return value from ff_h264_check_intra_pred_mode

Conflicts:
	libavcodec/svq3.c

See: 019eb2c7Merged-by: Michael Niedermayer <michaelni@gmx.at>