[FFmpeg-cvslog] Merge commit 'df7aba52b51007db50410abe15fe28391abd8757'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Dec  9 18:06:52 2013 +0100| [58f70f17017ec586a50f1fea4a744cbd11f74796] | committer: Michael Niedermayer

Merge commit 'df7aba52b51007db50410abe15fe28391abd8757'

* commit 'df7aba52b51007db50410abe15fe28391abd8757':
  frame: cosmetics, reindent

Conflicts:
	libavutil/frame.c

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=58f70f17017ec586a50f1fea4a744cbd11f74796
---