Merge commit 'a56a9e65c6a17dd8b6303dd45bdc3e3368093092' into release/2.2
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 11 May 2014 14:44:08 +0000 (16:44 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 11 May 2014 14:44:08 +0000 (16:44 +0200)
commit3a67865963de4b0fcbfd201f8894f6c48d5ca9c1
tree17afc5fa9f78504b1836f71ac8bf92dd6e5b4af7
parent3fb754712c8a680f32f9cba43d6176891ea3d240
parenta56a9e65c6a17dd8b6303dd45bdc3e3368093092
Merge commit 'a56a9e65c6a17dd8b6303dd45bdc3e3368093092' into release/2.2

* commit 'a56a9e65c6a17dd8b6303dd45bdc3e3368093092':
  swscale: Fix an undefined behaviour

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libswscale/utils.c