diff mbox

[FFmpeg-devel] avformat/Makefile: fix compilation of testprogs when networking is disabled

Message ID 1485353155-22770-1-git-send-email-t.rapp@noa-archive.com
State Accepted
Commit ec33ade7d300e7b300797b1944441c4aabaee3c8
Headers show

Commit Message

Tobias Rapp Jan. 25, 2017, 2:05 p.m. UTC 
Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>
---
 libavformat/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Michael Niedermayer Jan. 26, 2017, 7:16 p.m. UTC | #1 
On Wed, Jan 25, 2017 at 03:05:55PM +0100, Tobias Rapp wrote:
> Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>
> ---
>  libavformat/Makefile | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)

probably ok

thx

[...]
Tobias Rapp Jan. 30, 2017, 11:46 a.m. UTC | #2 
On 26.01.2017 20:16, Michael Niedermayer wrote:
> On Wed, Jan 25, 2017 at 03:05:55PM +0100, Tobias Rapp wrote:
>> Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>
>> ---
>>  libavformat/Makefile | 3 ++-
>>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> probably ok

Pushed.

Regards,
Tobias
diff mbox

Patch

diff --git a/libavformat/Makefile b/libavformat/Makefile
index f30bc94..8aab4d1 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -595,7 +595,8 @@  TESTPROGS = seek                                                        \
             url                                                         \
 #           async                                                       \
 
-TESTPROGS-$(CONFIG_FIFO_MUXER)          += fifo_muxer
+FIFO-MUXER-TESTPROGS-$(CONFIG_NETWORK)   += fifo_muxer
+TESTPROGS-$(CONFIG_FIFO_MUXER)           += $(FIFO-MUXER-TESTPROGS-yes)
 TESTPROGS-$(CONFIG_FFRTMPCRYPT_PROTOCOL) += rtmpdh
 TESTPROGS-$(CONFIG_MOV_MUXER)            += movenc
 TESTPROGS-$(CONFIG_NETWORK)              += noproxy