Merge commit '8769113a'

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

Merge commit '8769113a'
* commit '8769113a': mpeg4videoenc: K&R formatting cosmetics Conflicts: libavcodec/mpeg4videoenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
18df75fa · Michael Niedermayer · 3033cd75 · 8769113a · 18df75fa
Commit 18df75fa authored Nov 19, 2013 by Michael Niedermayer
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 644 additions and 587 deletions

mpeg4videoenc.c libavcodec/mpeg4videoenc.c +644 -587

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