Merge remote-tracking branch 'qatar/master'

Browse Source

* qatar/master:
  vc1: Fix intensity compensation performance regression

Conflicts:
	libavcodec/vc1.c

See: ed5bed4152
Merged-by: Michael Niedermayer <michaelni@gmx.at>

...

This commit is contained in:

Michael Niedermayer

2013-12-22 21:39:10 +01:00

parent 102b794e09 61ae993957

commit c19f193c6b

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