Merge remote-tracking branch 'cehoyos/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 16 Sep 2013 22:27:37 +0000 (00:27 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 16 Sep 2013 22:27:40 +0000 (00:27 +0200)
* cehoyos/master:
  Do not suggest to increase probesize for image2 files.

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

Trivial merge