Merge commit 'a1c69965'

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

Merge commit 'a1c69965'
* commit 'a1c69965': parser: K&R formatting cosmetics Conflicts: libavcodec/parser.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
72d580f8 · Michael Niedermayer · 03064364 · a1c69965 · 72d580f8
Commit 72d580f8 authored Feb 25, 2014 by Michael Niedermayer
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 103 additions and 93 deletions

parser.c libavcodec/parser.c +103 -93

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