[FFmpeg-cvslog] Merge commit '5ebb5a32bdd910a8afb316c51ed0b322f5600ae5' into release/0.8

[Michael Niedermayer]

ffmpeg | branch: release/0.8 | Michael Niedermayer <michaelni at gmx.at> | Sun Sep 22 17:25:47 2013 +0200| [44ebb2556d099c8103247b7c2b60eab399f300af] | committer: Michael Niedermayer

Merge commit '5ebb5a32bdd910a8afb316c51ed0b322f5600ae5' into release/0.8

* commit '5ebb5a32bdd910a8afb316c51ed0b322f5600ae5':
  shorten: report meaningful errors
  shorten: set invalid channels count to 0

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

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