[FFmpeg-cvslog] Merge commit '3d0752d82f8eaa326cff306ae50b0186a5b4d304' into release/2.4
Michael Niedermayer
git at videolan.org
Sat Jan 17 23:06:56 CET 2015
ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni at gmx.at> | Sat Jan 17 23:01:17 2015 +0100| [3cc8822c93e97e61308f440e62766f16819aad77] | committer: Michael Niedermayer
Merge commit '3d0752d82f8eaa326cff306ae50b0186a5b4d304' into release/2.4
* commit '3d0752d82f8eaa326cff306ae50b0186a5b4d304':
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=3cc8822c93e97e61308f440e62766f16819aad77
---
More information about the ffmpeg-cvslog
mailing list