diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-17 23:01:17 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-17 23:01:33 +0100 |
| commit | 3cc8822c93e97e61308f440e62766f16819aad77 (patch) | |
| tree | 7a09b00b64f0ffc2e92ad60c577631d141fe0613 /common.mak | |
| parent | 05b1ac24709b4e6ccc96d6c41c14ef915110a868 (diff) | |
| parent | 3d0752d82f8eaa326cff306ae50b0186a5b4d304 (diff) | |
| download | ffmpeg-3cc8822c93e97e61308f440e62766f16819aad77.tar.gz | |
Merge commit '3d0752d82f8eaa326cff306ae50b0186a5b4d304' into release/2.4
* commit '3d0752d82f8eaa326cff306ae50b0186a5b4d304':
xsub: Support DXSA subtitles
Conflicts:
libavcodec/xsubdec.c
See: d6f910ea47255b519e0b71c33d74c409a29ab3db
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'common.mak')
0 files changed, 0 insertions, 0 deletions