Merge commit '8769113accf1f3b78634dec60b37f7354ed6d88d'

Browse Source

* commit '8769113accf1f3b78634dec60b37f7354ed6d88d':
  mpeg4videoenc: K&R formatting cosmetics

Conflicts:
	libavcodec/mpeg4videoenc.c

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

...

This commit is contained in:

Michael Niedermayer 2013-11-19 15:47:44 +01:00

parent 3033cd7555 8769113acc

commit 18df75fa2f

1 changed files with 634 additions and 577 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

1211

libavcodec/mpeg4videoenc.c

File diff suppressed because it is too large Load Diff