Merge commit '60c4660ba035bbfbcc84ac34129ce40e037c70ad'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 12 Apr 2014 23:26:49 +0000 (01:26 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 12 Apr 2014 23:26:49 +0000 (01:26 +0200)
commit28875c418886e1576b657882ee2b969de85041a0
treece73485cdc210515b928f60baa63f9029fc54a26
parentd3284a62082b8224d2a31e050f160ccda9ce2487
parent60c4660ba035bbfbcc84ac34129ce40e037c70ad
Merge commit '60c4660ba035bbfbcc84ac34129ce40e037c70ad'

* commit '60c4660ba035bbfbcc84ac34129ce40e037c70ad':
  swscale: fix an implementation-defined unsigned-to-signed conversion

Conflicts:
libswscale/swscale_unscaled.c

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