Merge commit 'a84616b736fca5ebd6b87489dd41bc06ccdf7860'

* commit 'a84616b736fca5ebd6b87489dd41bc06ccdf7860':
  mpegvideo: K&R formatting cosmetics

Conflicts:
libavcodec/mpegvideo_motion.c

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

Merge commit '93f305473f880729d18b5e42067f19d2106cb2e5'

* commit '93f305473f880729d18b5e42067f19d2106cb2e5':
  lavc: Convert some remaining strides to ptrdiff_t

Conflicts:
libavcodec/h264.h
libavcodec/mpegvideo_enc.c
libavcodec/mpegvideo_motion.c
libavcodec/vp56.c
libavcodec/wmv2.c

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

Merge commit '4baba6c813b7a1f27370e20fb1a87b05fcb39208'

* commit '4baba6c813b7a1f27370e20fb1a87b05fcb39208':
  h264_parser: Fix POC parsing for the case where MMCO_RESET is present.

Conflicts:
libavcodec/h264.c

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

Merge commit 'b81dbd6cb7522bea96d78a52f8a4c25a47b820c9'

* commit 'b81dbd6cb7522bea96d78a52f8a4c25a47b820c9':
  h264_parser: Fix POC parsing for the case where MMCO_RESET is absent.

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

Merge commit '6b081eff4dfc3c899960f69f30cb567266b7dca3'

* commit '6b081eff4dfc3c899960f69f30cb567266b7dca3':
  fate: add vorbiscomment cover art test

Conflicts:
tests/fate/cover-art.mak

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

Merge commit '68edd5be0980941924ae633d98589d56a8091bbd'

* commit '68edd5be0980941924ae633d98589d56a8091bbd':
  FATE: use proper comparison mode in the lavr tests

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

Merge commit 'dd33637c18629c3e554ebb146bbeb45c9745a5cf'

* commit 'dd33637c18629c3e554ebb146bbeb45c9745a5cf':
  tiny_psnr: switch f32 handling to floating point

Conflicts:
tests/tiny_psnr.c

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

Merge commit '29c455ce3daf7fb369ba20cf77c74bd8e3b43b55'

* commit '29c455ce3daf7fb369ba20cf77c74bd8e3b43b55':
  bitstream: Check the result of av_malloc()

Conflicts:
libavcodec/bitstream.c

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

Merge commit '3b4fa54866f58bf3d8a8dcc460c73ef6564c0ad8'

* commit '3b4fa54866f58bf3d8a8dcc460c73ef6564c0ad8':
  cavs: more K&R formatting cosmetics

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

Merge commit 'c0085f94fea89b180e5727b193484a83586d3490'

* commit 'c0085f94fea89b180e5727b193484a83586d3490':
  mpegaudio_tablegen: Don't use llrint
  cos_tablegen: Don't use lrint
  tablegen: Don't use cbrtf in host tools
  tableprint: Fix use of a size_t print with MSVC

Conflicts:
libavcodec/cbrt_tablegen.h
libavcodec/mpegaudio_tablegen.h

See: e51692114354b8e460bf5c9f6def7089a6b969c0
See: 50867209930fd03c05b879bd6223b52c7305c90a
See: 008014b5e72442fe7c8bf4a31e6bb74469b81359
See: 00aa24ffee91d52488765088ea0f60748e2a2083
Merged-by: Michael Niedermayer <michaelni@gmx.at>

hevc: fixing TSCL_A_VIDYO_5 decoding output order(cherry picked from commit 19c5d9ed28606e7a166d180fc9f1517cb174146f)

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

fate: fix DBLK_A_MAIN10_VIXS_2 on big endian

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

FATE: add HEVC tests

The tests are disabled as 2 do not pass yet
(fate-hevc-conformance-PPS_A_qualcomm_7 and fate-hevc-conformance-RAP_A_docomo_4)

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

avformat/mov: fix "correctly" typo

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

lavf/matroskadec: Support HEVC demuxing.

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

lavf/mov: Support HEVC demuxing.

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

valgrind cleanup(cherry picked from commit 0d5efa40b94c0de92a1fe5091b21e0e2d36bae3d)

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

mpegvideo: K&R formatting cosmetics

lavc: Convert some remaining strides to ptrdiff_t

hevc: add ts demux support

cherry picked from commit 925ee44364a7bce58e2ac5bac91077ce0a75d883

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

lavc/hevc: mark decoder as experimental

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

lavc/hevc_ps: fix PIX_FMT enums

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

lavc: add a HEVC decoder.

Initially written by Guillaume Martres <smarter@ubuntu.com> as a GSoC
project. Further contributions by the OpenHEVC project and other
developers, namely:

Mickaël Raulet <mraulet@insa-rennes.fr>
Seppo Tomperi <seppo.tomperi@vtt.fi>
Gildas Cocherel <gildas.cocherel@laposte.net>
Khaled Jerbi <khaled_jerbi@yahoo.fr>
Wassim Hamidouche <wassim.hamidouche@insa-rennes.fr>
Vittorio Giovara <vittorio.giovara@gmail.com>
Jan Ekström <jeebjp@gmail.com>
Anton Khirnov <anton@khirnov.net>
Martin Storsjö <martin@martin.st>
Luca Barbato <lu_zero@gentoo.org>
Yusuke Nakamura <muken.the.vfrmaniac@gmail.com>

Signed-off-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/mpegaudio_tablegen: remove dead branch

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

avformat: rename a few more h.265 to HEVC

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

avcodec: improve precission for cbrtf() emulation

cbrtf() took floats but it represented 1/3 exactly
and even if not more precission should be better in theory
for the table generation

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

h264_parser: Fix POC parsing for the case where MMCO_RESET is present.

Signed-off-by: Anton Khirnov <anton@khirnov.net>

h264_parser: Fix POC parsing for the case where MMCO_RESET is absent.

The prev_ values were not set after parsing POC.
Increase length of the buffer decoded to parse enough safely.

Signed-off-by: Anton Khirnov <anton@khirnov.net>

fate: add vorbiscomment cover art test

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>

FATE: use proper comparison mode in the lavr tests

tiny_psnr: switch f32 handling to floating point

Also add support for f64.

bitstream: Check the result of av_malloc()

cavs: more K&R formatting cosmetics

mpegaudio_tablegen: Don't use llrint

You cannot count on it being present on all systems, and you
cannot include libm.h in a host tool, so just hard code a baseline
implementation.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

cos_tablegen: Don't use lrint

You cannot count on it being present on all systems, and you
cannot include libm.h in a host tool, so just hard code a baseline
implementation.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

tablegen: Don't use cbrtf in host tools

You cannot count on them being present on all systems, and you
cannot include libm.h in a host tool, so just hard code baseline
implementations.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

tableprint: Fix use of a size_t print with MSVC

%zu was introduced in C99, so MSVC has its own way to handle it,
namely %Iu.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

mpegaudio_tablegen: Don't use llrint

You cannot count on it being present on all systems, and you
cannot include libm.h in a host tool, so just hard code a baseline
implementation.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

cos_tablegen: Don't use lrint

You cannot count on it being present on all systems, and you
cannot include libm.h in a host tool, so just hard code a baseline
implementation.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

tablegen: Don't use cbrtf in host tools

You cannot count on them being present on all systems, and you
cannot include libm.h in a host tool, so just hard code baseline
implementations.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

tableprint: Fix use of a size_t print with MSVC

%zu was introduced in C99, so MSVC has its own way to handle it,
namely %Iu.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

configure: Warn when inline asm is disabled for ICL

See Ticket3048

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

lavf/segment: simplify logic and fix !=0 check on segment_end return value

A successfull return value can be > 0.

lavf/segment: log segments as they end to AV_LOG_VERBOSE

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>

lavf/segment: simplify segment_count update

Now segment_count mark the segment_count of the current segment.

fate: add pxr24 exr test

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

avcodec/jpeg2000dec: fix context consistency with too large lowres

Fixes out of array accesses
Fixes Ticket2898

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  http: Check the auth string contents and not only the pointer

Conflicts:
libavformat/http.c

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

avcodec/x86/dsputil_init: move ff_idct_xvid_mmxext init

This decreases the diff to libav

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

avcodec/x86/dsputil_init: remove duplicated sse2 idct init

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

avcodec/x86/dsputil_init: fix cpu flag checks

Fixes linking failure with --disable-sse2

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

doc: make x11grab examples consistent with option names

Change -r to -framerate, but either will work.
Change -s to -video_size, but either will work.

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>

matroskadec: Demux support for SeekPreRoll and CodecDelay

Adds support for demuxing SeekPreRoll and CodecDelay container
elements.

Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

http: Check the auth string contents and not only the pointer

This makes sure we don't send the Except: 100-continue header
if no authentication credentials have been provided.

Signed-off-by: Martin Storsjö <martin@martin.st>

avformat/rpl: use avpriv_report_missing_feature/avpriv_request_sample

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

lavc: Adding seek_preroll to AVCodecContext

seek_preroll field is added to the AVCodecContext struct. It indicates
the number of samples to be discarded whenever there is a discontinuity.
The minor version is bumped accordingly.

Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Support H.264 fourcc UMSV.

Fixes ticket #3046.

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: more AVX2 framework

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

Merge commit 'c6908d6b4b377a04a5d055ba874bdbcf06c80497'

* commit 'c6908d6b4b377a04a5d055ba874bdbcf06c80497':
  x86inc: FMA3/4 Support

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

Merge commit '206895708ea2b464755d340e44501daf9a07c310'

* commit '206895708ea2b464755d340e44501daf9a07c310':
  x86inc: Remove our FMA4 support

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

Merge commit 'c108ba0175d4fc3a3253a8b0f782fbfb96ba5098'

* commit 'c108ba0175d4fc3a3253a8b0f782fbfb96ba5098':
  x86inc: Use VEX-encoded instructions in AVX functions

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

Merge commit '15748773bf33c110e6e2e9526c7ba5478274c74c'

* commit '15748773bf33c110e6e2e9526c7ba5478274c74c':
  avresample/x86: Switch operand order for mulps

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

Merge commit '84a125c4c28f3e3e215d2e6c32f7f0ec43bbc04c'

* commit '84a125c4c28f3e3e215d2e6c32f7f0ec43bbc04c':
  rtmp: Allocate the prev_pkt arrays dynamically

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

x86: more AVX2 framework

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

x86inc: FMA3/4 Support

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

x86inc: Remove our FMA4 support

This is so we can sync to x264's version of FMA4 support.

This partialy reverts commit 79687079a97a039c325ab79d7a95920d800b791f.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

x86inc: Use VEX-encoded instructions in AVX functions

Automatically use VEX-encoding in AVX/AVX2/XOP/FMA3/FMA4
functions for all instructions that exists in a VEX-encoded
version.

This change makes it easier to extend existing code to use AVX2.

Also add support for AVX emulation of a few instructions that
were missing before.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

avresample/x86: Switch operand order for mulps

With the forthcoming VEX instruction emulation, mulps
must have only the third operand point to memory, as
this is what vmulps expects.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

rtmp: Allocate the prev_pkt arrays dynamically

Normally, all channel ids are between 0 and 10, while they in
uncommon cases can have values up to 64k.

This avoids allocating two arrays for up to 64k entries (at a total
of over 6 MB in size) each when most of them aren't used at all.

Signed-off-by: Martin Storsjö <martin@martin.st>

movenc: use ff_alloc_extradata()

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

oggparsecelt: use ff_alloc_extradata()

Signed-off-by: James Almer <jamrial@gmail.com>
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

oggparseopus: use ff_alloc_extradata()

Signed-off-by: James Almer <jamrial@gmail.com>
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  cavs: Check for negative cbp

Conflicts:
libavcodec/cavsdec.c

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

Merge commit '1b20d0f581f01f2df601c9e68d0d321672d97af7'

* commit '1b20d0f581f01f2df601c9e68d0d321672d97af7':
  cavs: Return meaningful error values

Conflicts:
libavcodec/cavsdec.c

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

Merge commit '14ddbb477faef359983151b763fd8b20e578651b'

* commit '14ddbb477faef359983151b763fd8b20e578651b':
  cavs: K&R formatting cosmetics

Conflicts:
libavcodec/cavs.c

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

avformat/http: check the auth string contents not the pointer which cannot be NULL

It appears this bug originates from a "work in progress" patch from
ffmpeg-devel that was heavily redesigned by and integrated in libav

And that patch even had a reply and review on the mailing list pointing
out that it had a bug.

This fixes a deadlock with ffserver

See: [FFmpeg-devel] [PATCH] Fix HTTP authentication problem for POST actions.
     [FFmpeg-devel] [PATCH 1/3] Introduce auth_phase flag, which will be true if authorization needs to be sent, but the type of authorization is not known yet Partial fix #3036
     [FFmpeg-devel] [PATCH 2/3] Only add Transfer-Encoding header when not in authorization phase, because server will wait (indefinitely) for data when receiving this header Partial fix #3036
     [FFmpeg-devel] [PATCH 3/3] Only allow posting data and/or forcing a 200 code, enabling posting isml chunks, -after- we did a possible first request to get a 403 from the server telling us which type of authentication to apply Final part fix #3036
See: 71549a857b13edf4c4f95037de6ed5bb4c4bd4af
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '71549a857b13edf4c4f95037de6ed5bb4c4bd4af'

* commit '71549a857b13edf4c4f95037de6ed5bb4c4bd4af':
  http: Support auth method detection for POST

Conflicts:
libavformat/version.h

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

Merge commit 'eb8b05a3824a9fa85e20d603595ac8a3b83505d4'

* commit 'eb8b05a3824a9fa85e20d603595ac8a3b83505d4':
  http: Add an option for forcing basic authentication

Conflicts:
libavformat/http.c
libavformat/version.h

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

Merge commit 'eb90a2091ffb94d8c29aaa5ff50f4192520254fc'

* commit 'eb90a2091ffb94d8c29aaa5ff50f4192520254fc':
  pthread: Fix deadlock during thread initialization

Conflicts:
libavcodec/pthread.c

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

avformat/westwood_vqa: s/unsigned char/uint8_t & s/unsigned int/uint32_t

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

avformat: use ff_alloc_extradata()

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

avformat: add ff_alloc_extradata() helper

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

avcodec/jpeg2000dec: prevent out of array accesses in pixel addressing

Fixes Ticket2921

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

avcodec/jpeg2000: zero i/f_data

Fixes uninitialized use of variables

Fixes part of Ticket2921

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

Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: add support for changing the channel by the C key
  ffplay: cycle through the streams of the current program, and not every stream
  ffplay: add null packet after attached pics packet
  ffplay: factor out putting null packet into the queue

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

avcodec/jpeg2000dec: check transform equality in MCT

Fixes null pointer dereference
Fixes Ticket2843

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

avformat/oggparseopus: fix nb_headers

Line comes from ecab1c77410f023b437c6ed3a3281be8f039e574
and was not merged previously

Thanks-to: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

cavs: Check for negative cbp

Sample-Id: 00000647-google
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org

cavs: Return meaningful error values

cavs: K&R formatting cosmetics

ffplay: add support for changing the channel by the C key

Signed-off-by: Marton Balint <cus@passwd.hu>

ffplay: cycle through the streams of the current program, and not every stream

When changing the audio, video or subtitle stream, from now on, ffplay will
cycle through the streams of the current program.

Signed-off-by: Marton Balint <cus@passwd.hu>

ffplay: add null packet after attached pics packet

Fixes ticket #2904.

Signed-off-by: Marton Balint <cus@passwd.hu>

ffplay: factor out putting null packet into the queue

Signed-off-by: Marton Balint <cus@passwd.hu>

http: Support auth method detection for POST

Inspired by a patch by Jakob van Bethlehem. But instead of doing
an empty POST first to trigger the WWW-Authenticate header (which
would succeed if no auth actually was required), add an Expect:
100-continue header, which is meant to be used exactly for
cases like this.

The header is added if doing a post, and the user has specified
authentication but we don't know the auth method yet.

Not all common HTTP servers support the Expect: 100-continue header,
though, so we only try to use it when it really is needed. The user
can request it to be added for other POST requests as well via
an option - which would allow the caller to know immediately that
the POST has failed (e.g. if no auth was provided but the server
required it, or if the target URL simply doesn't exist).

This is only done for write mode posts (e.g. posts without pre-set
post_data) - for posts with pre-set data, we can just redo the post
if it failed due to 401.

Signed-off-by: Martin Storsjö <martin@martin.st>

http: Add an option for forcing basic authentication

The default is to autodetect the auth method. This does require one
extra request (and also closing and reopening the http connection).
For some cases such as HTTP POST, the autodetection is not handled
properly (yet).

No option is added for digest, since this method requires getting
nonce parameters from the server first and can't be used straight
away like Basic.

Signed-off-by: Martin Storsjö <martin@martin.st>

avformat/vocdec: return AVERROR_EOF when EOF is reached

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

pthread: Fix deadlock during thread initialization

Sometimes, if pthread_create() failed, then pthread_cond_wait() could
accidentally be called in the worker threads after the uninit function
had already called pthread_cond_broadcast(), leading to a deadlock.

Don't call pthread_cond_wait() if c->done is set.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

doc/developer: Merge license related policy items

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  indeo4: Check the inherited quant_mat

Conflicts:
libavcodec/indeo4.c

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