Merge branch 'ipp' of github.com:wang-bin/QtAV into ipp

Browse Source

Conflicts:
	src/ImageConverterIPP.cpp

...

This commit is contained in:

LucasWang

2013-01-25 19:24:27 +08:00

parent 2fbbb7ff94 1cd8886cb3

commit cd25ed4ded

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available