Merge commit '9a2387cfb1a99e4b00593c22074929cdc73410f0' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 4 May 2014 21:46:08 +0000 (23:46 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 4 May 2014 21:46:08 +0000 (23:46 +0200)
commit0597f052372b9e5877af7ad8b1e632d511931db6
treebb37ebf66a920fb6059b2a159a8dca21e3ca3374
parent227ac71a60937785a5e5e21618a929ee3b887015
parent9a2387cfb1a99e4b00593c22074929cdc73410f0
Merge commit '9a2387cfb1a99e4b00593c22074929cdc73410f0' into release/1.1

* commit '9a2387cfb1a99e4b00593c22074929cdc73410f0':
  swscale: Fix an undefined behaviour

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