Merge remote-tracking branch 'qatar/master'

Browse Source

* qatar/master:
  vc1dsp: K&R formatting cosmetics

Conflicts:
	libavcodec/vc1dsp.c

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

...

This commit is contained in:

Michael Niedermayer 2014-01-12 20:04:35 +01:00

parent 6bd001d766 a1f5164814

commit 4daf8bc31b

1 changed files with 397 additions and 315 deletions

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

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

712

libavcodec/vc1dsp.c

View File

File diff suppressed because it is too large Load Diff