[FFmpeg-cvslog] Merge remote-tracking branch 'cehoyos/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed May 15 11:37:51 2013 +0200| [3ac3edf63baa2f550a004b2039e6fbd227801351] | committer: Michael Niedermayer

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Reduce probing score for flic animation files.

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

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