Merge commit 'a36947c167d7278b891453083b57dc56b7a7f5c5'

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

Conflicts:
	libavcodec/x86/dsputilenc_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
pull/293/head
Michael Niedermayer 11 years ago
commit b7a5f5dc66
  1. 1497
      libavcodec/x86/dsputilenc_mmx.c

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save