diff options
| author | James Almer <jamrial@gmail.com> | 2017-09-27 18:56:08 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-09-27 19:00:50 -0300 |
| commit | 7659f35638e2ca7a8b202cb3007ca5473b108fa4 (patch) | |
| tree | 2832fafc044eddc970f74fd569a67a6ade401b44 /libavformat/mtv.c | |
| parent | f3aefb3e1c3c6afeaca889d4fd2648458fd74dfe (diff) | |
| parent | dad7a9c7c0ae8ebc56f2e3a24e6fa4da5c2cd491 (diff) | |
| download | ffmpeg-7659f35638e2ca7a8b202cb3007ca5473b108fa4.tar.gz | |
Merge commit 'dad7a9c7c0ae8ebc56f2e3a24e6fa4da5c2cd491'
* commit 'dad7a9c7c0ae8ebc56f2e3a24e6fa4da5c2cd491':
configure: Rework dependency handling for conflicting components
Includes an important fix made by c546147db07d16a76c2fb698d2e8a3057f393475
as well.
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavformat/mtv.c')
0 files changed, 0 insertions, 0 deletions