Merge commit '6072184e702b4b631ac72f1b66b75e5f21e0ce2d'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 1 May 2014 15:40:14 +0000 (17:40 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 1 May 2014 15:40:14 +0000 (17:40 +0200)
commitbb5657fabfecd4007816d7310a410f628aa5bf91
tree31ac5e11e0f9f9bc8601c21ff24d0b354111df15
parent00c3ff26f230048e844130fcae0ab29ee20991c9
parent6072184e702b4b631ac72f1b66b75e5f21e0ce2d
Merge commit '6072184e702b4b631ac72f1b66b75e5f21e0ce2d'

* 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>
libavformat/asfenc.c
tests/ref/lavf/asf
tests/ref/seek/lavf-asf