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>

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

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

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>

* commit '9d64f236':
  hls: Respect the different stream time bases when comparing dts

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

* commit 'c11e33a3':
  hls: Set stream offset before opening a chained demuxer

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

* commit 'cdd2d73d':
  hls: Don't check discard flags until the parent demuxer's streams actually exist
  hls: Copy the time base from the chained demuxer

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

* commit 'eb33ba04':
  hls: Return all packets from a previous variant before moving on to the next one

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

* commit 'c5b46a06':
  lavf: Don't interpret just slightly broken timestamps as wraparound

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

* commit '2219e27b':
  oma: correctly mark and decrypt partial packets

Conflicts:
	libavformat/omadec.c

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

* commit '9d0b45ad':
  oma: check geob tag boundary

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

* commit '4f03a77e':
  oma: refactor seek function
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '3ca1dd25':
  xl: Make sure the width is valid

Conflicts:
	libavcodec/xl.c

See: 94b42da6Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '0f51c398':
  http: Support reading gzip/deflate compressed data
  utvideoenc: use av_image_copy_plane()

Conflicts:
	libavformat/http.c
See: b09d86c6
See: 6bab3430Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '62b1e3b1':
  aasc: Check minimum buffer size

Conflicts:
	libavcodec/aasc.c

See: e1631f8e
See: 8a57ca5cMerged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '45ee556d':
  qdm2: Whitespace cosmetics
  flac: use meaningful return values

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

* commit 'f1cb490d':
  xl: Fix the buffer size check

Conflicts:
	libavcodec/xl.c

See: 8c59e0c3Merged-by: Michael Niedermayer <michaelni@gmx.at>