diff options
author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-24 17:46:10 +0000 |
---|---|---|
committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-24 17:46:10 +0000 |
commit | 34e4c588c8e86fc407f8a67942434949f51b7da6 (patch) | |
tree | fba7ed12afa96dab869b7ee739d03522a1210677 /ffmpeg_vdpau.c | |
parent | 3c5a040ad94d0758e5b8949b049926f172812ef2 (diff) | |
parent | 82454c3a826bc8aa42474097784b70befd5be532 (diff) | |
download | ffmpeg-34e4c588c8e86fc407f8a67942434949f51b7da6.tar.gz |
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>
Diffstat (limited to 'ffmpeg_vdpau.c')
0 files changed, 0 insertions, 0 deletions