Merge commit '84cfce9f99805a144df684417e166c1ae6f95421'

Browse Source

* commit '84cfce9f99805a144df684417e166c1ae6f95421':
  matroskadec: K&R formatting cosmetics

Conflicts:
	libavformat/matroskadec.c

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

pull/293/head

Michael Niedermayer 11 years ago

parent 84bccae8e9 84cfce9f99

commit b3d9ab1829

1 changed files with 573 additions and 490 deletions

Whitespace

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Split View

Diff Options

Show Stats Download Patch File Download Diff File

1. 1063
     libavformat/matroskadec.c

1063

libavformat/matroskadec.c

View File

File diff suppressed because it is too large Load Diff

Write Preview

Loading…

Cancel

Save