Merge commit 'a36947c167d7278b891453083b57dc56b7a7f5c5'

Browse Source

* commit 'a36947c167d7278b891453083b57dc56b7a7f5c5':
  dsputilenc_mmx: K&R formatting cosmetics

Conflicts:
	libavcodec/x86/dsputilenc_mmx.c

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

...

This commit is contained in:

Michael Niedermayer

2014-03-14 01:09:57 +01:00

parent d926c4b240 a36947c167

commit b7a5f5dc66

1 changed files with 700 additions and 657 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

1357

libavcodec/x86/dsputilenc_mmx.c

File diff suppressed because it is too large Load Diff