Merge commit '5ebb5a32bdd910a8afb316c51ed0b322f5600ae5' into release/0.8
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 22 Sep 2013 15:25:47 +0000 (17:25 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 22 Sep 2013 15:25:51 +0000 (17:25 +0200)
commit44ebb2556d099c8103247b7c2b60eab399f300af
tree3dc5715fcb8f8b3e145b6fcc55615db3ec3a8322
parent0a41da3e9d2090c562b752d086bcbd4dee69c796
parent5ebb5a32bdd910a8afb316c51ed0b322f5600ae5
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@gmx.at>
libavcodec/shorten.c