Merge commit '86ba2327'

* commit '86ba2327': mpegts: K&R formatting cosmetics Conflicts: libavformat/mpegts.c Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '86ba2327'
* commit '86ba2327': mpegts: K&R formatting cosmetics Conflicts: libavformat/mpegts.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
ceb0d79f · Michael Niedermayer · 48f7d5f0 · 86ba2327 · ceb0d79f
Commit ceb0d79f authored Mar 18, 2014 by Michael Niedermayer
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 399 additions and 348 deletions

mpegts.c libavformat/mpegts.c +399 -348

No files found.
--- a/libavformat/mpegts.c
+++ b/libavformat/mpegts.c