-
Michael Niedermayer authored
* commit 'b2e059a1': pixdesc: K&R formatting cosmetics Conflicts: libavutil/pixdesc.c libavutil/pixdesc.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
229a1e86
* commit 'b2e059a1': pixdesc: K&R formatting cosmetics Conflicts: libavutil/pixdesc.c libavutil/pixdesc.h Merged-by: Michael Niedermayer <michaelni@gmx.at>