Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 9 Oct 2013 09:04:06 +0000 (11:04 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 9 Oct 2013 09:04:06 +0000 (11:04 +0200)
commit7f22df3a49459dc61cd63f4a7329c38bc842f4f3
tree60f627276d96954bea46abd9a17a9fc6f4a2748a
parent3aabfaa37b245f86036ea11d82c7c28e5bebde6a
parentb2148faca9e9e553c14b27844b56e367c85a777e
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  shorten: Extend fixed_coeffs to properly support pred_order 0

Conflicts:
libavcodec/shorten.c

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