diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-17 21:07:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-17 21:41:55 +0200 |
| commit | eb706575baa646d3d2400d85a521386a4df3d979 (patch) | |
| tree | b2f98bfd8d68d6282747e7847574ccec3a71d04f /libavformat/subtitles.h | |
| parent | 3d40ba3d81276c659191b0de9653e9ec69c090f1 (diff) | |
| parent | 96ce6d6f119a16e489941c629a2805204322b717 (diff) | |
| download | ffmpeg-eb706575baa646d3d2400d85a521386a4df3d979.tar.gz | |
Merge commit '96ce6d6f119a16e489941c629a2805204322b717'
* commit '96ce6d6f119a16e489941c629a2805204322b717':
doc: Add more information in the README
Conflicts:
README.md
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/subtitles.h')
0 files changed, 0 insertions, 0 deletions