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

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>

* commit 'e13a9293':
  xl: K&R formatting cosmetics

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

Without the information, an application may choose audio from one
variant and video from another variant, which leads to fetching two
variants from the network. This enables av_find_best_stream() to find
matching audio and video streams, so that only one variant is fetched.
Signed-off-by: Martin Storsjö <martin@martin.st>

Also adjust the streams timestamps according to their start
timestamp when comparing. This helps getting correctly interleaved
packets if one stream lacks timestamps (such as a plain ADTS
stream when the other variants are full mpegts) when the others
have timestamps that don't start from zero.

This probably doesn't work properly if such a stream is
temporarily disabled (via the discard flags) and then reenabled,
and such streams are hard to correctly sync against the other
streams as well - but this works better than before at least.

The segment number restriction makes sure all variants advance
roughly at the same pace as well.
Signed-off-by: Martin Storsjö <martin@martin.st>

This makes sure we don't accidentally check discard flags
for the wrong stream.
Signed-off-by: Martin Storsjö <martin@martin.st>

If passing the end of one segment while initializing the
chained demuxer, the parent demuxer's streams aren't set up
yet, so we can't recheck the discard flags.
Signed-off-by: Martin Storsjö <martin@martin.st>

When a variant stream isn't mpegts but e.g. raw adts, the
default time base (90k) isn't correct.
Signed-off-by: Martin Storsjö <martin@martin.st>

This serves as a safeguard; normally we want to use the dts
comparison to interleave packets from all active variants. If that
dts comparison for some reason doesn't work as intended, make sure
that all packets in all variants for a certain sequence number have
been returned before moving on to the next one.
Signed-off-by: Martin Storsjö <martin@martin.st>

This avoids breaking some slightly incorrect (dts > pts) timestamps
in sample HLS streams from Apple.
Signed-off-by: Martin Storsjö <martin@martin.st>

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

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

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

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

The patch worked on little endian because pgm decoding was broken
but it was not correct in any way.

This reverts commit 7651c0e4.