diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-08 00:04:17 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-08 00:09:13 +0100 |
| commit | 3ed80bd95e1dd6864dbd08fa622d7eec97ac9a38 (patch) | |
| tree | b4ee64ff2463e87c8d211b28014200bc8133f600 /ffplay.c | |
| parent | 0e1bb03cb034fcdc83f964fd8ca5e98c569078be (diff) | |
| parent | 5a1addd7c1d8ff218ed4b84f4f02fdb83980094c (diff) | |
| download | ffmpeg-3ed80bd95e1dd6864dbd08fa622d7eec97ac9a38.tar.gz | |
Merge commit '5a1addd7c1d8ff218ed4b84f4f02fdb83980094c'
* commit '5a1addd7c1d8ff218ed4b84f4f02fdb83980094c':
xsub: Support DXSA subtitles
Conflicts:
libavcodec/xsubdec.c
See: d6f910ea47255b519e0b71c33d74c409a29ab3db
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffplay.c')
0 files changed, 0 insertions, 0 deletions