Merge commit 'e4529df9'

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

Merge commit 'e4529df9'
* commit 'e4529df9': flvdec: K&R formatting cosmetics Conflicts: libavformat/flvdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
ae48547a · Michael Niedermayer · cb73f840 · e4529df9 · ae48547a
Commit ae48547a authored Aug 02, 2013 by Michael Niedermayer
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 410 additions and 339 deletions

flvdec.c libavformat/flvdec.c +410 -339

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