* commit '8e104619':
  shorten: check for return value

Conflicts:
	libavcodec/shorten.c

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