Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 10 Feb 2013 13:17:06 +0000 (14:17 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 10 Feb 2013 13:17:06 +0000 (14:17 +0100)
commit02b3ac87f81a614120c492b9df2b294d1c54755e
tree115a08c9d644f9faf3fd60b8657cc5c3c9f173e1
parentf2b89f21cc3dfcfda911e621c3ea62f3175eacbe
parent813784a8bf907f6fd1d96c11e85586cee5c05695
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  sws: disable yuv2rgb warning for planar rgb.

Conflicts:
libswscale/yuv2rgb.c

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