[FFmpeg-cvslog] Merge commit '8e104619a627fcf5f4c2bd3c09d0c2d323aae745'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Nov 13 14:21:58 2014 +0100| [ecb748866e00841e2e00e2c9c3438391a9e9e760] | committer: Michael Niedermayer

Merge commit '8e104619a627fcf5f4c2bd3c09d0c2d323aae745'

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

Conflicts:
	libavcodec/shorten.c

See: e20ebe491c17388a312e04ff060c217ecfafc914
Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ecb748866e00841e2e00e2c9c3438391a9e9e760
---