Merge commit 'ff409c7d80b6781e4b81dd860badb569061ddaa5' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Apr 2014 13:55:28 +0000 (15:55 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Apr 2014 13:55:28 +0000 (15:55 +0200)
commitfcaf78f5f94130471dcbd9fa63e8363ce2fdefe0
treed34e1f1a79c269b38d3470599fbbc640eacce052
parent8e5a02151227f1fc4639c2047ba0059a2dba243d
parentff409c7d80b6781e4b81dd860badb569061ddaa5
Merge commit 'ff409c7d80b6781e4b81dd860badb569061ddaa5' into release/1.1

* commit 'ff409c7d80b6781e4b81dd860badb569061ddaa5':
  adx: check that the offset is not negative

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