Merge commit 'd234c7a0'

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

Merge commit 'd234c7a0'
* commit 'd234c7a0': mpeg4videodec: K&R formatting cosmetics Conflicts: libavcodec/mpeg4videodec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2c6e693c · Michael Niedermayer · 18df75fa · d234c7a0 · 2c6e693c
Commit 2c6e693c authored Nov 19, 2013 by Michael Niedermayer
Hide whitespace changes
Inline Side-by-side

Showing with 1461 additions and 1261 deletions

mpeg4videodec.c libavcodec/mpeg4videodec.c +1461 -1261

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