Merge remote-tracking branch 'qatar/master'

Browse Source

* qatar/master:
  mpeg: K&R formatting cosmetics

Conflicts:
	libavcodec/mpeg12dec.c

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

...

This commit is contained in:

Michael Niedermayer 2014-02-05 03:59:37 +01:00

parent 6e380cc28f a91d3658d9

commit acd7505351

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

804

libavcodec/mpeg12dec.c

File diff suppressed because it is too large Load Diff