[FFmpeg-cvslog] Merge commit '537b5b773b317af79d3a5b576ee9683e15ed84f6'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Tue Apr  4 15:56:36 2017 -0300| [30518a68a74b82abaf2a8f230fee18b7e6c477fa] | committer: James Almer

Merge commit '537b5b773b317af79d3a5b576ee9683e15ed84f6'

* commit '537b5b773b317af79d3a5b576ee9683e15ed84f6':
  rtmpdh: Do global initialization before running the test

Merged-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=30518a68a74b82abaf2a8f230fee18b7e6c477fa
---

 libavformat/tests/rtmpdh.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavformat/tests/rtmpdh.c b/libavformat/tests/rtmpdh.c
index 929b3f3..77139a5 100644
--- a/libavformat/tests/rtmpdh.c
+++ b/libavformat/tests/rtmpdh.c
@@ -16,6 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavformat/avformat.h"
 #include "libavformat/rtmpdh.c"
 
 #include <stdio.h>
@@ -150,6 +151,7 @@ fail:
 
 int main(void)
 {
+    avformat_network_init();
     if (test_random_shared_secret() < 0)
         return 1;
     if (test_ref_data() < 0)


======================================================================