aboutsummaryrefslogtreecommitdiffstats
path: root/libswscale/x86/yuv2rgb_template.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-01-21 21:55:20 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-01-21 21:55:20 +0100
commit53feab7a4e99f53fec74f8e8c83f7cc76481eb9a (patch)
tree4db8795d526eb242cc5e4160e372a6ae0424949a /libswscale/x86/yuv2rgb_template.c
parent797d807869f0b960a1fbd11258c644c02a1ba2ac (diff)
parent9047491f8bcd87673eed55fb310647a03b0981e9 (diff)
downloadffmpeg-53feab7a4e99f53fec74f8e8c83f7cc76481eb9a.tar.gz
Merge commit '9047491f8bcd87673eed55fb310647a03b0981e9'
* commit '9047491f8bcd87673eed55fb310647a03b0981e9': swscale: add nv12/nv21->yuv420 converter Conflicts: libswscale/rgb2rgb.c libswscale/rgb2rgb_template.c See: ef627bf9ecddfa888d4c6e4fd633852798c3b4a9 Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/x86/yuv2rgb_template.c')
0 files changed, 0 insertions, 0 deletions