Merge commit 'b7b1bf91'

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

Merge commit 'b7b1bf91'
* commit 'b7b1bf91': mpegts: K&R formatting cosmetics Conflicts: libavformat/mpegtsenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
ec0b08d2 · Michael Niedermayer · c6a596f6 · b7b1bf91 · ec0b08d2
Commit ec0b08d2 authored Aug 07, 2014 by Michael Niedermayer
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 292 additions and 268 deletions

mpegtsenc.c libavformat/mpegtsenc.c +292 -268

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