Merge commit '4c364eb2b856fc33cf7b42f7c7b979e69fde5f3a'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 6 Mar 2013 22:47:10 +0000 (23:47 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 6 Mar 2013 22:47:10 +0000 (23:47 +0100)
commit90f8b2ce48cfbffeb64779a8c2d55a1e078b4657
treea077687783a032b52a7b03a9f63d29925d516568
parent09131ebb562472effd81726c2c14c3ec7164b695
parent4c364eb2b856fc33cf7b42f7c7b979e69fde5f3a
Merge commit '4c364eb2b856fc33cf7b42f7c7b979e69fde5f3a'

* commit '4c364eb2b856fc33cf7b42f7c7b979e69fde5f3a':
  shorten: report meaningful errors

Conflicts:
libavcodec/shorten.c

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