Merge commit 'd234c7a07c1313fd215e8e242492bf71f5f3321e'

Browse Source

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

Conflicts:
	libavcodec/mpeg4videodec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

...

This commit is contained in:

Michael Niedermayer 2013-11-19 16:52:23 +01:00

parent 18df75fa2f d234c7a07c

commit 2c6e693c97

1 changed files with 1437 additions and 1237 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2674

libavcodec/mpeg4videodec.c

File diff suppressed because it is too large Load Diff