Merge commit '7f93a861'

* commit '7f93a861': mpeg12enc: K&R formatting cosmetics Conflicts: libavcodec/mpeg12enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '7f93a861'
* commit '7f93a861': mpeg12enc: K&R formatting cosmetics Conflicts: libavcodec/mpeg12enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2a27e525 · Michael Niedermayer · 61845dc7 · 7f93a861 · 2a27e525
Commit 2a27e525 authored Sep 06, 2013 by Michael Niedermayer
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 529 additions and 456 deletions

mpeg12enc.c libavcodec/mpeg12enc.c +529 -456

No files found.
--- a/libavcodec/mpeg12enc.c
+++ b/libavcodec/mpeg12enc.c