Merge commit 'e4c9e59a45'

Browse source

* commit 'e4c9e59a45':
  mpeg: K&R formatting cosmetics

Conflicts:
	libavformat/mpegenc.c

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

...

This commit is contained in:

Michael Niedermayer 2014-08-08 21:31:54 +02:00

parent fd1e4d66f1 e4c9e59a45

commit a698efbc9d

1 changed files with 331 additions and 309 deletions

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

Download patch file Download diff file Expand all files Collapse all files

640

libavformat/mpegenc.c

View file

File diff suppressed because it is too large Load diff