Merge commit 'b7b1bf9166ac3102c401295fdd5d4933c512aa50'

Browse Source

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

Conflicts:
	libavformat/mpegtsenc.c

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

...

This commit is contained in:

Michael Niedermayer 2014-08-07 21:16:06 +02:00

parent c6a596f626 b7b1bf9166

commit ec0b08d20b

1 changed files with 283 additions and 259 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

542

libavformat/mpegtsenc.c

File diff suppressed because it is too large Load Diff