* 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>

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.

This fixes memory leaks present since 2b3d041c.
Signed-off-by: Martin Storsjö <martin@martin.st>

Also parse segment durations as floating point, which is allowed
since HLS version 3.
Signed-off-by: Martin Storsjö <martin@martin.st>

Also parse segment durations as floating point, which is allowed
since HLS version 3.

This is based on a patch by Zhang Rui.
Signed-off-by: Martin Storsjö <martin@martin.st>

When first_timestamp was stored as-is, its actual time base
wasn't known later in the seek function.

Additionally, the logic (from 795d9594) for scaling it
based on stream_index is flawed - stream_index in the seek
function only specifies which stream the seek timestamp refers
to, but obviously doesn't say anything about which stream
first_timestamp belongs to.

In the cases where stream_index was >= 0 and all streams had the
same time base, this didn't matter in practice.

Seeking taking first_timestamp into account is problematic
when one variant is mpegts (with real timestamps) and one variant
is raw ADTS (with timestamps only being accumulated packet
duration), where the variants start at totally different timestamps.
Signed-off-by: Martin Storsjö <martin@martin.st>

Bug-Id: 452
Signed-off-by: Diego Biurrun <diego@biurrun.de>

Compilation with --disable-everything --enable-shared failed
on systems with VAAPI support with the following undefined
symbol in libavcodec/vaapi.o:
libavcodec/libavcodec.so: undefined reference to `ff_mpeg_draw_horiz_band'

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

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

This reverts commit 4b6869d6.

Conflicts:

	libavcodec/bitstream.c

This code can cause assertion failures on artificial OOM situations
It will be replaced by a solution that doesnt have this issue in the
following commits.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

* qatar/master:
  hls: Create an AVProgram for each variant

Conflicts:
	libavformat/hls.c

See: 23db5418Merged-by: Michael Niedermayer <michaelni@gmx.at>