Merge commit '2f792cb6703b5b12f2e873bee13f33da8aa9940a'
authorJames Almer <jamrial@gmail.com>
Wed, 1 Nov 2017 23:33:02 +0000 (20:33 -0300)
committerJames Almer <jamrial@gmail.com>
Wed, 1 Nov 2017 23:33:02 +0000 (20:33 -0300)
commit580732e3a5d789adaefb1e6ca16749f47a1223b2
treea0bec0f6bd0edcb831988c2d59b8c8fb6a5f3f40
parent862c85b2ff0db551222950ecfa7693e8e3bb18ef
parent2f792cb6703b5b12f2e873bee13f33da8aa9940a
Merge commit '2f792cb6703b5b12f2e873bee13f33da8aa9940a'

* commit '2f792cb6703b5b12f2e873bee13f33da8aa9940a':
  build: Add missing idctdsp dependency for clearvideo
  build: Add missing mpeg4audio dependency for RTP muxer

This commit is a noop, see
52f954da7594c31ad94c9bcb54290145b59b27f5
155f071bad5a06364f42a4533b352a85a1451d97

Merged-by: James Almer <jamrial@gmail.com>