Browse Source

Merge commit '86ba2327e1cf35c6f77d5fb516a1a7a8dce0b98a'

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

Conflicts:
	libavformat/mpegts.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.3
Michael Niedermayer 12 years ago
parent
commit
ceb0d79f46
1 changed files with 399 additions and 348 deletions
  1. +399
    -348
      libavformat/mpegts.c

+ 399
- 348
libavformat/mpegts.c
File diff suppressed because it is too large
View File


Loading…
Cancel
Save