Merge commit '5a1addd7c1d8ff218ed4b84f4f02fdb83980094c'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 7 Jan 2015 23:04:17 +0000 (00:04 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 7 Jan 2015 23:09:13 +0000 (00:09 +0100)
commit3ed80bd95e1dd6864dbd08fa622d7eec97ac9a38
treeb4ee64ff2463e87c8d211b28014200bc8133f600
parent0e1bb03cb034fcdc83f964fd8ca5e98c569078be
parent5a1addd7c1d8ff218ed4b84f4f02fdb83980094c
Merge commit '5a1addd7c1d8ff218ed4b84f4f02fdb83980094c'

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

Conflicts:
libavcodec/xsubdec.c

See: d6f910ea47255b519e0b71c33d74c409a29ab3db
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/xsubdec.c