Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 3 Apr 2012 23:14:45 +0000 (01:14 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 3 Apr 2012 23:14:45 +0000 (01:14 +0200)
commit41a097aada4d45bddb492bb47d64e67423001775
tree462100064dc3808b56bfcd96804cac15e5a974c9
parentae3ee72e02ecbbde53391a25175c7eed66fc9ffd
parentb991b300f2d60f7726cdc2b15fd12591b89dc972
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Unscaled Planar RGB -> RGB support in swscale.

Conflicts:
libswscale/swscale_unscaled.c

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