* commit 'dd0bfc3a':
  dsicinav: Bound-check the source buffer when needed

Conflicts:
	libavcodec/dsicinav.c

See: 47f0beadMerged-by: Michael Niedermayer <michaelni@gmx.at>