Merge remote-tracking branch 'qatar/master'

* qatar/master: mpeg: K&R formatting cosmetics Conflicts: libavcodec/mpeg12dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge remote-tracking branch 'qatar/master'
* qatar/master: mpeg: K&R formatting cosmetics Conflicts: libavcodec/mpeg12dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
acd75053 · Michael Niedermayer · 6e380cc2 · a91d3658 · acd75053
Commit acd75053 authored Feb 05, 2014 by Michael Niedermayer
Expand all Show whitespace changes
Inline Side-by-side

Showing with 458 additions and 350 deletions

mpeg12dec.c libavcodec/mpeg12dec.c +458 -350

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