Merge remote-tracking branch 'cehoyos/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 8 Sep 2013 21:49:28 +0000 (23:49 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 8 Sep 2013 21:49:33 +0000 (23:49 +0200)
commit7caaa72e624812e87c25af456310599f2e091b1c
treee47a6b07d2eabedcf0413413e61161fa6e6827b5
parent43497d8a838e21e7327452a52c75d397f004d7d3
parent43353bf32c928ea52bdca786bb09eb490dbe8477
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  libxvid: guess a good aspect when we cant store the exact one.

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