]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2d62e06 f25117a)
Merge commit 'f25117a4286505b38c12466ef04459471de3c1b0'
authorJames Almer <jamrial@gmail.com>
Sun, 2 Sep 2018 22:21:35 +0000 (19:21 -0300)
committerJames Almer <jamrial@gmail.com>
Sun, 2 Sep 2018 22:21:35 +0000 (19:21 -0300)
* commit 'f25117a4286505b38c12466ef04459471de3c1b0':
  libsrt: Pass the correct pointer for the passphrase

Merged-by: James Almer <jamrial@gmail.com>
1  2 
libavformat/libsrt.c patch | diff1 | diff2 | blob | history

diff --cc libavformat/libsrt.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.