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>

pull/51/head

Michael Niedermayer 11 years ago

parent 102b794e09 61ae993957

commit c19f193c6b

Whitespace

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

Split View

Diff Options

Show Stats Download Patch File Download Diff File

Diff Content Not Available