Merge commit 'a2ad554d'

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

Merge commit 'a2ad554d'
* commit 'a2ad554d': shorten: K&R formatting cosmetics Conflicts: libavcodec/shorten.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
09131ebb · Michael Niedermayer · be493ca2 · a2ad554d · 09131ebb
Commit 09131ebb authored Mar 06, 2013 by Michael Niedermayer
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 118 additions and 110 deletions

shorten.c libavcodec/shorten.c +118 -110

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