Merge commit 'df7aba52b51007db50410abe15fe28391abd8757'

Browse Source

* commit 'df7aba52b51007db50410abe15fe28391abd8757':
  frame: cosmetics, reindent

Conflicts:
	libavutil/frame.c

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

...

This commit is contained in:

Michael Niedermayer 2013-12-09 18:06:52 +01:00

parent 3f5f955c53 df7aba52b5

commit 58f70f1701

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