Merge commit 'bb12c2e9c0'

Browse source

* commit 'bb12c2e9c0':
  dsputil: K&R formatting cosmetics

Conflicts:
	libavcodec/dsputil.c

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

...

This commit is contained in:

Michael Niedermayer 2014-03-14 00:31:48 +01:00

parent db94b144e9 bb12c2e9c0

commit dd7c2e9bce

1 changed files with 1905 additions and 1563 deletions

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

3468

libavcodec/dsputil.c

View file

File diff suppressed because it is too large Load diff