Merge commit 'df7aba52b51007db50410abe15fe28391abd8757'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 9 Dec 2013 17:06:52 +0000 (18:06 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 9 Dec 2013 17:16:35 +0000 (18:16 +0100)
commit58f70f17017ec586a50f1fea4a744cbd11f74796
tree7d9f679b56f106a66db64e5b070dea304adf5977
parent3f5f955c5366de1f0dc643d9631b6cc19ba008cd
parentdf7aba52b51007db50410abe15fe28391abd8757
Merge commit 'df7aba52b51007db50410abe15fe28391abd8757'

* commit 'df7aba52b51007db50410abe15fe28391abd8757':
  frame: cosmetics, reindent

Conflicts:
libavutil/frame.c

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