* commit 'df7aba52b51007db50410abe15fe28391abd8757': frame: cosmetics, reindent Conflicts: libavutil/frame.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
17 KiB
17 KiB
* commit 'df7aba52b51007db50410abe15fe28391abd8757': frame: cosmetics, reindent Conflicts: libavutil/frame.c Merged-by: Michael Niedermayer <michaelni@gmx.at>