Merge remote-tracking branch 'cehoyos/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Jun 2014 12:01:17 +0000 (14:01 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Jun 2014 12:01:21 +0000 (14:01 +0200)
* cehoyos/master:
  Allow >2G for skip_initial_bytes.

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

Trivial merge