[FFmpeg-cvslog] Merge commit '6072184e702b4b631ac72f1b66b75e5f21e0ce2d'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu May  1 17:40:14 2014 +0200| [bb5657fabfecd4007816d7310a410f628aa5bf91] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bb5657fabfecd4007816d7310a410f628aa5bf91
---