Merge commit '10aa44aa675e05067845e3e55fac37642cbbdae4'

Browse Source

* commit '10aa44aa675e05067845e3e55fac37642cbbdae4':
  avidec: K&R formatting cosmetics

Conflicts:
	libavformat/avidec.c

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

...

This commit is contained in:

Michael Niedermayer

2013-07-28 13:06:38 +02:00

parent 1ecf380223 10aa44aa67

commit d781220991

1 changed files with 560 additions and 462 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

libavformat/avidec.c

+560 -462

File diff suppressed because it is too large Load Diff