Merge commit 'd234c7a07c1313fd215e8e242492bf71f5f3321e'

* commit 'd234c7a07c1313fd215e8e242492bf71f5f3321e':
  mpeg4videodec: K&R formatting cosmetics

Conflicts:
	libavcodec/mpeg4videodec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
pull/46/merge
Michael Niedermayer 11 years ago
commit 2c6e693c97
  1. 2722
      libavcodec/mpeg4videodec.c

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save