Merge commit '8e104619a627fcf5f4c2bd3c09d0c2d323aae745'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Nov 2014 13:21:58 +0000 (14:21 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Nov 2014 13:21:58 +0000 (14:21 +0100)
commitecb748866e00841e2e00e2c9c3438391a9e9e760
tree086ef75be3e04308b0b6fd6061a25189b0322a6b
parent785f71fcd508113a4717bd6efcb2e0545b1c2e66
parent8e104619a627fcf5f4c2bd3c09d0c2d323aae745
Merge commit '8e104619a627fcf5f4c2bd3c09d0c2d323aae745'

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

Conflicts:
libavcodec/shorten.c

See: e20ebe491c17388a312e04ff060c217ecfafc914
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/shorten.c