Merge commit '86ba2327e1cf35c6f77d5fb516a1a7a8dce0b98a'

Browse Source

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

Conflicts:
	libavformat/mpegts.c

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

...

This commit is contained in:

Michael Niedermayer 2014-03-18 13:16:56 +01:00

parent 48f7d5f0cf 86ba2327e1

commit ceb0d79f46

1 changed files with 399 additions and 348 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

747

libavformat/mpegts.c

View File

File diff suppressed because it is too large Load Diff