libavutil/frame.c · 6ea05ef278b2f99fe87e4dd37900e4f1acc2b050 · libremedia / Tethys / FFmpeg

11 years ago

Michael Niedermayer authored 11 years ago


* commit 'df7aba52':
  frame: cosmetics, reindent

Conflicts:
	libavutil/frame.c

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

58f70f17

Michael Niedermayer authored 11 years ago


* commit 'df7aba52':
  frame: cosmetics, reindent

Conflicts:
	libavutil/frame.c

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