Merge commit '7f93a861aaf2e76fd63b53ccc465909873b8dc29'

Browse Source

* commit '7f93a861aaf2e76fd63b53ccc465909873b8dc29':
  mpeg12enc: K&R formatting cosmetics

Conflicts:
	libavcodec/mpeg12enc.c

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

...

This commit is contained in:

Michael Niedermayer 2013-09-06 13:00:47 +02:00

parent 61845dc74a 7f93a861aa

commit 2a27e52550

1 changed files with 529 additions and 456 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

985

libavcodec/mpeg12enc.c

File diff suppressed because it is too large Load Diff