[FFmpeg-cvslog] Merge commit '5a1addd7c1d8ff218ed4b84f4f02fdb83980094c'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jan  8 00:04:17 2015 +0100| [3ed80bd95e1dd6864dbd08fa622d7eec97ac9a38] | committer: Michael Niedermayer

Merge commit '5a1addd7c1d8ff218ed4b84f4f02fdb83980094c'

* commit '5a1addd7c1d8ff218ed4b84f4f02fdb83980094c':
  xsub: Support DXSA subtitles

Conflicts:
	libavcodec/xsubdec.c

See: d6f910ea47255b519e0b71c33d74c409a29ab3db
Merged-by: Michael Niedermayer <michaelni at gmx.at>

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