Merge commit '82454c3a826bc8aa42474097784b70befd5be532'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 24 Feb 2016 17:46:10 +0000 (17:46 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 24 Feb 2016 17:46:10 +0000 (17:46 +0000)
commit34e4c588c8e86fc407f8a67942434949f51b7da6
treefba7ed12afa96dab869b7ee739d03522a1210677
parent3c5a040ad94d0758e5b8949b049926f172812ef2
parent82454c3a826bc8aa42474097784b70befd5be532
Merge commit '82454c3a826bc8aa42474097784b70befd5be532'

* commit '82454c3a826bc8aa42474097784b70befd5be532':
  build: Let the WTV demuxer select the MPEG-TS demuxer
  build: Adjust mpeg4video parser dependencies
  build: Fix mpegvideo component dependencies
  build: Fix dependencies for components relying on H.263 data tables

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