* commit 'df7aba52':
  frame: cosmetics, reindent

Conflicts:
	libavutil/frame.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>