diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-29 16:50:39 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-29 16:51:10 +0000 |
| commit | 9c75148e6ebc88a0501e3d0242defb6dbdc3c23d (patch) | |
| tree | e24939addbed549191606f8b6927b29b42c18394 /tests/fate | |
| parent | e3461197b1ffa0b4ebb80ee3d8567d3b286d7fc3 (diff) | |
| parent | 2758cdedfb7ac61f8b5e4861f99218b6fd43491d (diff) | |
Merge commit '2758cdedfb7ac61f8b5e4861f99218b6fd43491d'
This commit also disables the async fate test, because it
used internal APIs in a non-kosher way, which no longer
exists.
* commit '2758cdedfb7ac61f8b5e4861f99218b6fd43491d':
lavf: reorganize URLProtocols
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'tests/fate')
| -rw-r--r-- | tests/fate/libavformat.mak | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/fate/libavformat.mak b/tests/fate/libavformat.mak index 1d6aa863b6..965011d0b9 100644 --- a/tests/fate/libavformat.mak +++ b/tests/fate/libavformat.mak @@ -1,6 +1,6 @@ -FATE_LIBAVFORMAT-$(HAVE_PTHREADS) += fate-async -fate-async: libavformat/async-test$(EXESUF) -fate-async: CMD = run libavformat/async-test +#FATE_LIBAVFORMAT-$(HAVE_PTHREADS) += fate-async +#fate-async: libavformat/async-test$(EXESUF) +#fate-async: CMD = run libavformat/async-test FATE_LIBAVFORMAT-$(CONFIG_NETWORK) += fate-noproxy fate-noproxy: libavformat/noproxy-test$(EXESUF) |