Merge commit '0eecafc948b74c247ebbc59f18f508db5d590d0b'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 16 Jan 2013 11:07:04 +0000 (12:07 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 16 Jan 2013 11:07:27 +0000 (12:07 +0100)
* commit '0eecafc948b74c247ebbc59f18f508db5d590d0b':
  configure: Make the new srtp protocol depend on the rtp protocol
  lavf: Add a fate test for the SRTP functions
  lavu: Add a fate test for the HMAC API

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
configure
libavformat/Makefile
libavformat/srtp.c
libavutil/Makefile
libavutil/hmac.c
tests/fate/libavutil.mak

diff --cc configure
Simple merge
@@@ -438,7 -374,12 +438,8 @@@ OBJS-$(CONFIG_UDP_PROTOCOL
  
  SKIPHEADERS-$(CONFIG_FFRTMPCRYPT_PROTOCOL) += rtmpdh.h
  SKIPHEADERS-$(CONFIG_NETWORK)            += network.h rtsp.h
 -
 -EXAMPLES  = metadata                                                    \
 -            output                                                      \
 -
  TESTPROGS = seek                                                        \
+             srtp                                                        \
              url                                                         \
  
  TOOLS     = aviocat                                                     \
Simple merge
@@@ -115,10 -106,9 +115,11 @@@ TESTPROGS = adler3
              cpu                                                         \
              crc                                                         \
              des                                                         \
 +            error                                                       \
              eval                                                        \
 +            file                                                        \
              fifo                                                        \
+             hmac                                                        \
              lfg                                                         \
              lls                                                         \
              md5                                                         \
Simple merge
Simple merge