projects / ffmpeg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f977e69 9487ffd)
Merge commit '9487ffd4c02b9e261562d43735490068c0df0d4b'
authorMichael Niedermayer <michael@niedermayer.cc>
Thu, 30 Jul 2015 10:14:13 +0000 (12:14 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Thu, 30 Jul 2015 10:14:54 +0000 (12:14 +0200)
* commit '9487ffd4c02b9e261562d43735490068c0df0d4b':
  rtmpproto: free hmac context properly

See: 6ce3d9fc4a70958680b93c6995cc87f34630a7e3
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

Trivial merge
FFmpeg git repo