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

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>

Fixes Ticket1616
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

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

* qatar/master:
  Replace remaining obsolete PIX_FMT names with AV_PIX_FMT equivalents

Conflicts:
	libavcodec/g2meet.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '1f57d601':
  rtsp: Support RFC4570 (source specific multicast) more properly.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '74972220':
  rtpproto: Support more than one SSM include address, support excludes

Conflicts:
	libavformat/rtpproto.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '7d99c929':
  udp: Keep track of include and exclude sources separately

Conflicts:
	libavformat/udp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '3357bccc':
  udp: Allow specifying multicast include/blocks as host names as well
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '0e8c6f22':
  avisynth: Fix a "AVISynth" vs. "AviSynth" struct name typo

Conflicts:
	doc/general.texi
	libavformat/avisynth.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '4822ee3c':
  configure: Detect AIX ar command instead of hardcoding it in the OS section
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '711c4da1':
  fate: Add tree test

Conflicts:
	tests/fate/libavutil.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'd99a2b6d':
  avutil/tree: Drop debug messages that clutter the output

Conflicts:
	libavutil/tree.c

Merge for metadata only, a better solution has been commited that allows the
debug output to be turned on and off
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

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

* commit '10db1a9b':
  avutil/tree: K&R formatting cosmetics

Conflicts:
	libavutil/tree.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'c47037c7':
  fate: Add timefilter test
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '06205b5e':
  hls: Free packets when skipping packets when seeking
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'a2b7eeeb':
  hlsproto: Store all durations in AV_TIME_BASE

Conflicts:
	libavformat/hlsproto.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'c4419103':
  hls: Store all durations in AV_TIME_BASE

Conflicts:
	libavformat/hls.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'e1d5b244':
  hls: Store first_timestamp in units of AV_TIME_BASE

Conflicts:
	libavformat/hls.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '55c4cba2':
  huffyuvenc: BGRA support

Conflicts:
	libavcodec/huffyuvenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

The code is no longer needed
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

This ensures that we dont write into one struct and read the other without
realizing that they arent identical.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Paul B Mahol <onemda@gmail.com>

Add support for domain names, for multiple source addresses,
for exclusions, and for session level specification of addresses.
Signed-off-by: Martin Storsjö <martin@martin.st>

Signed-off-by: Martin Storsjö <martin@martin.st>

This allows us to explicitly fail if the caller tried to set
both inclusions and exclusions at the same time.
Signed-off-by: Martin Storsjö <martin@martin.st>

Previously this only allowed literal IP addresses. When these
are conveyed in a SDP file as in RFC4570, host names are allowed
as well.
Signed-off-by: Martin Storsjö <martin@martin.st>

Signed-off-by: Paul B Mahol <onemda@gmail.com>

Fixes Ticket2813
Fixes regression since 70b5583bSigned-off-by: Michael Niedermayer <michaelni@gmx.at>

Also fix some similar typos in comments and documentation.