Merge commit 'fc1eda543c6ef043300612db90da5cfd972af650'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 18 Oct 2014 21:39:56 +0000 (23:39 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 18 Oct 2014 21:40:50 +0000 (23:40 +0200)
* commit 'fc1eda543c6ef043300612db90da5cfd972af650':
  swscale: fix sign extensions in yuv planar conversion

Conflicts:
libswscale/rgb2rgb_template.c

See: a07e9d72a1d97dc6a4d57e1f7b708e54e7db83f5
See: a30972609ca39b791ce1e4e5cc6c3dd6cb9c9b12
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libswscale/rgb2rgb_template.c

Simple merge