Merge commit '86ba2327e1cf35c6f77d5fb516a1a7a8dce0b98a'

Browse Source

* commit '86ba2327e1cf35c6f77d5fb516a1a7a8dce0b98a':
  mpegts: K&R formatting cosmetics

Conflicts:
	libavformat/mpegts.c

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

pull/293/head

Michael Niedermayer 11 years ago

parent 48f7d5f0cf 86ba2327e1

commit ceb0d79f46

1 changed files with 399 additions and 348 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. 747
     libavformat/mpegts.c

747

libavformat/mpegts.c

View File

File diff suppressed because it is too large Load Diff

Write Preview

Loading…

Cancel

Save