* commit 'a188108e':
  aac: Support channel configurations 11 and 12
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '677c804a':
  aac: correctly map 7.1ch-wide AAC from FDK AAC encoder

Sample: FDK_7.1ch_wide.aac
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '252d6200':
  avio: Add avio_put_str16be

Conflicts:
	doc/APIchanges
	libavformat/avio.h
	libavformat/aviobuf.c
	libavformat/version.h

The FFmpeg implementation is kept as requested by ubitux
Doxy improvements merged
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '9b56ac74':
  mpjpeg: Initial implementation

Conflicts:
	Changelog
	libavformat/allformats.c
	libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

This slightly improves precision
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>

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

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

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

Reviewed-by: "Reynaldo H. Verdejo Pinochet" <reynaldo@osg.samsung.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

These are defined in ISO/IEC 14496-3:2009/PDAM 4 for 6.1 and 7.1.
It also defines another 7.1 layout with configuration 14, that one
is not added here for now.

11: 3/3.1    FC FL+FR BL+BR BC LFE
12: 3/2/2.1  FC FL+FR SiL+SiR BL+BR LFE
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

FDK AAC encoder outputs SCE(front)+CPE(front)+CPE(back)+CPE(back) on
MODE_7_1_REAR_SURROUND configuration.
Since decoder couldn't properly map 4 back channels, decoding failed
unless -request_channel_layout 0x8000000000000000 has been specified.
Now we treat first CPE(back) as CPE(side) on channel mapping.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

Support only streams with Content-Length.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

Signed-off-by: James Almer <jamrial@gmail.com>

We shouldn't pick nvenc by default.
Signed-off-by: Philip Langdale <philipl@overt.org>

calc_coefficients is no longer being called every frame
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Also check for allocation failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This is probably redundant but its safer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

This allows us to offer the same codec name that libav uses. We don't have
a special way to do aliases, so it's all a bit more verbose than you'd want
but such is life.
Signed-off-by: Philip Langdale <philipl@overt.org>

For the sake of compatibility, and because pretty much everything else in the
codebase calls it HEVC.
Signed-off-by: Philip Langdale <philipl@overt.org>

This reverts commit d0d09137.
Signed-off-by: Philip Langdale <philipl@overt.org>

This reverts commit d8bbb99c, reversing
changes made to d0d09137.
Signed-off-by: Philip Langdale <philipl@overt.org>

This reverts commit f1049704.
Signed-off-by: Philip Langdale <philipl@overt.org>

This reverts commit 3be811a5.
Signed-off-by: Philip Langdale <philipl@overt.org>

This reverts commit 440fa775.
Signed-off-by: Philip Langdale <philipl@overt.org>

They are unused and colorspace.h is not a installed header
Found-by: Timo Rothenpieler <timo@rothenpieler.org>
Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Various header informations need to be reset when decoding next frame.
Regression since: 95582b5c

Fixes ticket #4597.
Signed-off-by: Paul B Mahol <onemda@gmail.com>

They are inlined wrapper functions inside the time.h header on MinGW-w64, so
neither check_func() or check_func_headers() work with them.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>

Found-by: Timo Rothenpieler <timo@rothenpieler.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Note: [xy]_off and screen_[wh] variables are int, as well as
X11GrabContext.{width,height,x_off,y_off}.

Note: AVCodecContext.refs is an int field.

Note: MpegEncContext.mb_{y,height} are int fields, as well as local off
variable.

Note: {wanted,min,max}_samples are int variables.

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

* cigaes/master:
  lavf/http: Add simple autodetection for client HTTP method, based on AVIO_FLAG_READ.
  lavf/http: Indent else-clause.
  lavf/http: Properly process HTTP header on listen.
  lavf/http: Rudimentary error handling for HTTP requests received from clients.
  lavf/http: Process HTTP header before sending response.
  lavf/http: Document method option.
Merged-by: Michael Niedermayer <michaelni@gmx.at>