-
Michael Niedermayer authored
* commit '89ef08c9': DNxHD: K&R formatting cosmetics Conflicts: libavcodec/dnxhd_parser.c libavcodec/dnxhddec.c libavcodec/dnxhdenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
bad101ab
* commit '89ef08c9': DNxHD: K&R formatting cosmetics Conflicts: libavcodec/dnxhd_parser.c libavcodec/dnxhddec.c libavcodec/dnxhdenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>