* commit '6072184e702b4b631ac72f1b66b75e5f21e0ce2d': asfenc: use codec descriptors instead of AVCodecs to write codec info Conflicts: tests/ref/lavf/asf tests/ref/seek/lavf-asf Merged-by: Michael Niedermayer <michaelni@gmx.at>