Merge remote-tracking branch 'qatar/master'

* qatar/master:
  rtmp: rtmp_parse_result() add case for video and audio packets to avoid undesired debug output.
  configure: Move the getaddrinfo function check into the network block
  configure: Remove an unused 'have' item
  mpeg: remove disabled code
  libfdk-aac: Check if cutoff value is valid
  network: Always use our version of gai_strerror on windows
  network: Undefine existing gai_strerror definitions
  network: Extend the fallback gai_strerror implementation to handle more error codes

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc configure
index 084c161,6b46ee4..4663467
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -1187,10 -1061,8 +1187,9 @@@ HAVE_LIST=
      attribute_may_alias
      attribute_packed
      cbrtf
 +    clock_gettime
      closesocket
      cmov
-     CommandLineToArgvW
      cpuid
      dcbzl
      dev_bktr_ioctl_bt848_h
@@@ -3180,11 -2863,8 +3181,9 @@@ f
  # Solaris has nanosleep in -lrt, OpenSolaris no longer needs that
  check_func nanosleep || { check_func nanosleep -lrt && add_extralibs -lrt; }
  
 +check_func  clock_gettime || { check_func clock_gettime -lrt && add_extralibs -lrt; }
  check_func  fcntl
  check_func  fork
- check_func  getaddrinfo $network_extralibs ||
-     check_func_headers ws2tcpip.h getaddrinfo $network_extralibs
  check_func  gethrtime
  check_func  getopt
  check_func  getrusage

diff --cc libavcodec/libfdk-aacenc.c
Simple merge

diff --cc libavformat/mpeg.c
Simple merge

diff --cc libavformat/network.h
Simple merge

diff --cc libavformat/os_support.c
Simple merge

diff --cc libavformat/rtmpproto.c
Simple merge