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)
commit7dea2eab7e3b37126f376fa73fc1242b42bd3db8
treed0bba3d170bb3c6438d80451734fb49507d5583a
parentbcac6b438e67946199c75c189bba76de6c04dac4
parent5c2be81b39ce1e694f33b59057a0878a8e0ad111
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Do not suggest to increase probesize for image2 files.

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