* commit 'cd8f772d':
  lavc: Add colorimetry values for BT.2020, other non-included ones

Conflicts:
	doc/APIchanges
	libavcodec/avcodec.h
	libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '446e37dc':
  vf_fieldorder: remove superfluous get_video_buffer

Conflicts:
	libavfilter/vf_fieldorder.c

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

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

fopen() on windows uses UTF-16, we use UTF-8 everywhere, this
function bridges the gap by using avpriv_open()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Suggested-by: divVerent
Reviewed-by: Stefano
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

That example shows how the decoding process works, not only the
demuxing.

* qatar/master:
  aacdec: Set the profile during decoding
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'da6506c6':
  lavc: move AVCodecContext.pkt to AVCodecInternal

Conflicts:
	libavcodec/internal.h
	libavcodec/rawdec.c
	libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '38ecc370':
  pthread: store thread contexts in AVCodecInternal instead of AVCodecContext

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

* commit 'daa7a1d4':
  pthread_slice: rename ThreadContext -> SliceThreadContext

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

* commit 'cc14ee03':
  lavc: split slice and frame threading functions into separate files

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

* commit '5cd6513f':
  pthread: drop avcodec_ prefixes from static functions
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '694d997a':
  x86: hpeldsp: Use PAVGB instruction macro where necessary

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

Previously the profile would not be set if the bitstream needs
to be decoded to know the profile.
Signed-off-by: Anton Khirnov <anton@khirnov.net>

It's a private field, not meant to be accessed from outside lavc.

It's a private field, it should not be visible to callers.

Deprecate AVCodecContext.thread_opaque

This should prevent confusion with frame threading.

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

* lukaszmluki/master:
  lavd/pulse: add ff_ prefix and fix param type
  lavd/pulse_audio_enc: fix flush return code
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Mikulas Patocka <mikulas@artax.karlin.mff.cuni.cz>
Signed-off-by: Diego Biurrun <diego@biurrun.de>

* qatar/master:
  build: Remove redundant OBJS declaration intended for programs

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

Add ff_ prefix for internal API function.
Change type of param from int into enum AVCodecID as it is more specific.
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>

Successful flushing is reported by returning 1 instead of 0.
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>

These streams are reported as seekable, but all tests show they are not,
and the server merely pretends the streams are seekable. The server
responds with:

    content-range: bytes 0-1999999999/2000000000

Range requests seem to be correctly answered, but the actual data
returned at the same offset is different. Assume this is a bug in the
server software. The server identifies itself as:

    Server: MediaGateway 3.5.2-001

Add a hack that checks the server name, and disables seeking in this
case.

Test URL: http://8283.live.streamtheworld.com:80/CBC_R1_VCR_H_SCSigned-off-by: Michael Niedermayer <michaelni@gmx.at>

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

The intent of the original check was to increase has_b_frames when
it was incorrectly set to 0. Later codecs allowed larger values

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

There are instructions pavgb and pavgusb. Both instructions do the same
operation but they have different enconding. Pavgb exists in SSE (or
MMXEXT) instruction set and pavgusb exists in 3D-NOW instruction set.

livavcodec uses the macro PAVGB to select the proper instruction. However,
the function avg_pixels8_xy2 doesn't use this macro, it uses pavgb
directly.

As a consequence, the function avg_pixels8_xy2 crashes on AMD K6-2 and
K6-3 processors, because they have pavgusb, but not pavgb.

This bug seems to be introduced by commit
71155d7b, "dsputil: x86: Convert mpeg4
qpel and dsputil avg to yasm"
Signed-off-by: Mikulas Patocka <mikulas@artax.karlin.mff.cuni.cz>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

In particular, warn in case -filter and streamcopy is used at the same
time, fix trac ticket #678.

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

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

* cigaes/master:
  lavfi/af_pan: support unknown layouts on input.
  lavfi/af_pan: support unknown layouts on output.
  lswr: fix assert failure on unknown layouts.
  lavfi: parsing helper for unknown channel layouts.
  lavfi/avfiltergraph: do not reduce incompatible lists.
  lavfi/avfiltergraph: suggest a solution when format selection fails.
  lavd/lavfi: support unknown channel layouts.
  lavf/wavenc: check for a single stream.
  lavd/alsa: add stream validation
  lavd/alsa: fix timestamp calculation
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* qatar/master:
  rtmpproto: Reorder conditions to help dead code elimination

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