diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-07 11:26:28 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-07 11:26:28 +0200 |
| commit | 7bd417c22a90a712df57cacfa5b09c1fb4f6183a (patch) | |
| tree | 791ce856605d50cc601bb892ec9ff0b073a73353 /libavformat/Makefile | |
| parent | 2adf8a9c09c9d00c4b34c062206cefad489f9ba9 (diff) | |
| parent | 6516632967da5e6bd7d6136e8678f826669ed26e (diff) | |
| download | ffmpeg-7bd417c22a90a712df57cacfa5b09c1fb4f6183a.tar.gz | |
Merge commit '6516632967da5e6bd7d6136e8678f826669ed26e'
* commit '6516632967da5e6bd7d6136e8678f826669ed26e':
tests: Only run noproxy test if networking is enabled
fifo: K&R formatting cosmetics
Conflicts:
libavformat/Makefile
libavutil/fifo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/Makefile')
| -rw-r--r-- | libavformat/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index d037661ac1..bde8278696 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -454,11 +454,12 @@ OBJS-$(CONFIG_UDP_PROTOCOL) += udp.o SKIPHEADERS-$(CONFIG_FFRTMPCRYPT_PROTOCOL) += rtmpdh.h SKIPHEADERS-$(CONFIG_NETWORK) += network.h rtsp.h -TESTPROGS = noproxy \ - seek \ +TESTPROGS = seek \ srtp \ url \ +TESTPROGS-$(CONFIG_NETWORK) += noproxy + TOOLS = aviocat \ ismindex \ pktdumper \ |