diff options
| author | James Almer <jamrial@gmail.com> | 2018-09-02 19:21:35 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2018-09-02 19:21:35 -0300 |
| commit | 768b07e3bca7e81d2f9c60badb3973d3d88481dc (patch) | |
| tree | b2890236ee6012b7926afcbf85df04ef49db33fe /libavcodec/mpeg4data.h | |
| parent | 2d62e06ff6a9f3dbd78136c1dc4a315a727c6f00 (diff) | |
| parent | f25117a4286505b38c12466ef04459471de3c1b0 (diff) | |
| download | ffmpeg-768b07e3bca7e81d2f9c60badb3973d3d88481dc.tar.gz | |
Merge commit 'f25117a4286505b38c12466ef04459471de3c1b0'
* commit 'f25117a4286505b38c12466ef04459471de3c1b0':
libsrt: Pass the correct pointer for the passphrase
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/mpeg4data.h')
0 files changed, 0 insertions, 0 deletions