* commit 'd1916d13':
  dsputil/pngdsp: fix signed/unsigned type in end comparison

Conflicts:
	libavcodec/dsputil.c

See: 454a11a1Merged-by: Michael Niedermayer <michaelni@gmx.at>