diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-04 01:14:45 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-04 01:14:45 +0200 |
| commit | 41a097aada4d45bddb492bb47d64e67423001775 (patch) | |
| tree | 462100064dc3808b56bfcd96804cac15e5a974c9 /tools | |
| parent | ae3ee72e02ecbbde53391a25175c7eed66fc9ffd (diff) | |
| parent | b991b300f2d60f7726cdc2b15fd12591b89dc972 (diff) | |
| download | ffmpeg-41a097aada4d45bddb492bb47d64e67423001775.tar.gz | |
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>
Diffstat (limited to 'tools')
0 files changed, 0 insertions, 0 deletions