Merge commit 'b7b1bf9166ac3102c401295fdd5d4933c512aa50'

Browse Source

* commit 'b7b1bf9166ac3102c401295fdd5d4933c512aa50':
  mpegts: K&R formatting cosmetics

Conflicts:
	libavformat/mpegtsenc.c

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

pull/80/head

Michael Niedermayer 11 years ago

parent c6a596f626 b7b1bf9166

commit ec0b08d20b

1 changed files with 292 additions and 268 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. 560
     libavformat/mpegtsenc.c

560

libavformat/mpegtsenc.c

View File

File diff suppressed because it is too large Load Diff

Write Preview

Loading…

Cancel

Save