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)
commita80342fe5633303a72d357c0bd9419bf3962dfdb
treea4ab09c65fb05523f2e1f1677131305cb76caffb
parentadf4ee40e7376d63d9c557e0e3e0e440e1144405
parentd58bcc1921f925b7094d4f2ee5df5b0c4e68bbe9
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Allow >2G for skip_initial_bytes.

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