Merge commit 'a84616b736fca5ebd6b87489dd41bc06ccdf7860'

Browse Source

* commit 'a84616b736fca5ebd6b87489dd41bc06ccdf7860':
  mpegvideo: K&R formatting cosmetics

Conflicts:
	libavcodec/mpegvideo_motion.c

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

...

This commit is contained in:

Michael Niedermayer 2013-10-16 13:54:41 +02:00

parent 10c6d1b28c a84616b736

commit 8610751d07

1 changed files with 500 additions and 440 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

940

libavcodec/mpegvideo_motion.c

View File

File diff suppressed because it is too large Load Diff