Merge commit '3407172b'

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

Merge commit '3407172b'
* commit '3407172b': avienc: K&R formatting cosmetics Conflicts: libavformat/avienc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
309171be · Michael Niedermayer · adaba6a1 · 3407172b · 309171be
Commit 309171be authored Mar 04, 2014 by Michael Niedermayer
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 219 additions and 209 deletions

avienc.c libavformat/avienc.c +219 -209

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