Merge commit '50ecf15712354a1d5b3f4dc9a57ff90ed7ee9654'

Browse Source

* commit '50ecf15712354a1d5b3f4dc9a57ff90ed7ee9654':
  avformat: utils: K&R formatting cosmetics

Conflicts:
	libavformat/utils.c

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

...

This commit is contained in:

Michael Niedermayer

2014-01-26 23:35:38 +01:00

parent c2871568cf 50ecf15712

commit 896d6a7736

2 changed files with 997 additions and 858 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

861

libavformat/utils.c

File diff suppressed because it is too large Load Diff