diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-01 04:50:21 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-01 05:00:30 +0200 |
| commit | 772787723958591f0134b846a3cc337c48978332 (patch) | |
| tree | 9ff886293d7a536bed3dda0138e370788464aae0 /libavcodec/ass.h | |
| parent | b50fa26885dc0c22dcb2f184d4d94da787b2d8a8 (diff) | |
| parent | 0069d4597bda5723fbcae410784bbfa4750df706 (diff) | |
| download | ffmpeg-772787723958591f0134b846a3cc337c48978332.tar.gz | |
Merge commit '0069d4597bda5723fbcae410784bbfa4750df706' into release/2.4
* commit '0069d4597bda5723fbcae410784bbfa4750df706':
Update changelog for v11.4
Conflicts:
Changelog
RELEASE
Not merged, our changelog differs from this
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ass.h')
0 files changed, 0 insertions, 0 deletions