Merge commit 'e4529df944616917ae8462f5102253ff7f983093'

Browse Source

* commit 'e4529df944616917ae8462f5102253ff7f983093':
  flvdec: K&R formatting cosmetics

Conflicts:
	libavformat/flvdec.c

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

...

This commit is contained in:

Michael Niedermayer

2013-08-02 12:07:20 +02:00

parent cb73f84087 e4529df944

commit ae48547a52

1 changed files with 408 additions and 337 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

745

libavformat/flvdec.c

File diff suppressed because it is too large Load Diff