Merge commit '65a802401c6cc136576bb2e613c0577cbf622aa8'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 17 Apr 2016 18:39:57 +0000 (19:39 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 17 Apr 2016 18:39:57 +0000 (19:39 +0100)
commit8f540b86125a25ee48ea6da69139356063726b8e
tree1e83b62764e4cba6d2fcacfb93893eccfdc15a97
parent9b36f446acbfa8322185b7af673f7a40a6d9095f
parent65a802401c6cc136576bb2e613c0577cbf622aa8
Merge commit '65a802401c6cc136576bb2e613c0577cbf622aa8'

* commit '65a802401c6cc136576bb2e613c0577cbf622aa8':
  build: Add component for the SRTP common code

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
configure
libavformat/Makefile