Merge remote-tracking branch 'cehoyos/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 15 May 2013 09:37:51 +0000 (11:37 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 15 May 2013 09:37:58 +0000 (11:37 +0200)
* cehoyos/master:
  Reduce probing score for flic animation files.

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

Trivial merge