Merge commit '84cfce9f99805a144df684417e166c1ae6f95421'

Browse Source

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

Conflicts:
	libavformat/matroskadec.c

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

...

This commit is contained in:

Michael Niedermayer 2014-03-07 23:46:37 +01:00

parent 84bccae8e9 84cfce9f99

commit b3d9ab1829

1 changed files with 575 additions and 492 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

1067

libavformat/matroskadec.c

File diff suppressed because it is too large Load Diff