-
Michael Niedermayer authored
* commit 'fcc455ff': avformat/dv: K&R formatting cosmetics Conflicts: libavformat/dv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
7565aaec
* commit 'fcc455ff': avformat/dv: K&R formatting cosmetics Conflicts: libavformat/dv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>