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>

Merge commit '0cb83c563848bf8f8365e7bd30e7e6b57ef360f0'

* commit '0cb83c563848bf8f8365e7bd30e7e6b57ef360f0':
  indeo4: Check the block size if reusing the band configuration

Conflicts:
libavcodec/indeo4.c

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

Merge commit 'fd2384f02b905a106fba9222ece4ddbe2ec61937'

* commit 'fd2384f02b905a106fba9222ece4ddbe2ec61937':
  oggparsevorbis: fail on memory allocation error

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

Merge commit 'c18375ec8040a9fe0f186b2033dc975883143758'

* commit 'c18375ec8040a9fe0f186b2033dc975883143758':
  oggvorbisdec: add support for embedded cover art

Conflicts:
libavformat/oggparsevorbis.c

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

Merge commit '601d6228c4811d8971a2412a759e1a4ab775ebe8'

* commit '601d6228c4811d8971a2412a759e1a4ab775ebe8':
  flac: move picture parsing code in a separate file

Conflicts:
libavformat/Makefile
libavformat/flacdec.c

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

Merge commit 'ecab1c77410f023b437c6ed3a3281be8f039e574'

* commit 'ecab1c77410f023b437c6ed3a3281be8f039e574':
  oggdec: add support for Opus in Ogg demuxing

Conflicts:
Changelog
libavformat/oggparseopus.c
libavformat/version.h

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

Merge commit 'ed9245dba83f9add60f55718b537b0af2105c60e'

* commit 'ed9245dba83f9add60f55718b537b0af2105c60e':
  oggparsevorbis: check allocations

Conflicts:
libavformat/oggparsevorbis.c

See: 033f1644b59abd755bb529afa5db394d18d9c30b
See: 84aea80f7824c23b4cbf101f03e2b5b418a79d80
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '9c15ef35d404fca2adc31276c1eedb11cf485461'

* commit '9c15ef35d404fca2adc31276c1eedb11cf485461':
  oggparsevorbis: support official chapter extension

Conflicts:
libavformat/oggparsevorbis.c

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

Merge commit '16ea20c827ef2ffaf77d5e05d5cf9983689f7b2b'

* commit '16ea20c827ef2ffaf77d5e05d5cf9983689f7b2b':
  lavc doxy: extend/clarify avcodec_decode_audio4() doxy

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

Merge commit '66d3f5fd5ca4cb3d09b52ad1041cd4359325a21a'

* commit '66d3f5fd5ca4cb3d09b52ad1041cd4359325a21a':
  lavc doxy: remove false statements about alignment requirements.

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

Merge commit '364af376f343d4706c4cdb7ab9fe0863994e6c01'

* commit '364af376f343d4706c4cdb7ab9fe0863994e6c01':
  FATE: add lavr resampling tests

The tests do not pass, and thus where disabled

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

Merge commit '9ab5f7107d2f1411e9fda6c36af64524e5ed31d1'

* commit '9ab5f7107d2f1411e9fda6c36af64524e5ed31d1':
  FATE: add lavr mixing tests

The tests do not pass, and thus where disabled

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

Merge commit 'df6737a55f5dc7c0ae5272bc5fa6182836d5481c'

* commit 'df6737a55f5dc7c0ae5272bc5fa6182836d5481c':
  audio_mix: fix channel order in mix_1_to_2_fltp_flt_c

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

indeo4: Check the inherited quant_mat

Invalidate it if not supported.

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

indeo4: Check the block size if reusing the band configuration

Sample-Id: 00000287-google

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

lavc: rename h265 to hevc, add AV_CODEC_ID_H265 with identical value for backward compatibility

Somehow 2 different identifiers have come into existence which makes supporting
both until the next major version bump required
I did not investigate how exactly that did happen.

wm4, j-b and smarter prefer hevc.

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

avformat/avr: use ff_get_pcm_codec_id()

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

avfilter/vsrc_testsrc: smpte(hd)bars: use yuv directly

Also set color space.

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

avfilter/vf_separatefields: do not reset pts to 0

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

oggparsevorbis: fail on memory allocation error

oggvorbisdec: add support for embedded cover art

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

flac: move picture parsing code in a separate file

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

oggdec: add support for Opus in Ogg demuxing

oggparsevorbis: check allocations

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

oggparsevorbis: support official chapter extension

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

lavc doxy: extend/clarify avcodec_decode_audio4() doxy

Elaborate on flushing the decoder.

lavc doxy: remove false statements about alignment requirements.

The packet data does not need to be aligned.

FATE: add lavr resampling tests

FATE: add lavr mixing tests

audio_mix: fix channel order in mix_1_to_2_fltp_flt_c

CC:libav-stable@libav.org

Merge remote-tracking branch 'lukaszmluki/master'

* lukaszmluki/master:
  avformat/ftp: add log regarding passive mode failure
  avformat/ftp: fix possible deadlock
  avdevice/pulse_audio_enc: fix stream index

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  riff: Add a mapping for VP6A

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

avformat/ftp: add log regarding passive mode failure

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>

avformat/ftp: fix possible deadlock

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>

avdevice/pulse_audio_enc: fix stream index

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>

riff: Add a mapping for VP6A

This allows demuxing VP6A from F4V files.

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

avfilter/lavfutils: fix memleak of avpacket

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

avfilter/vf_removelogo: fix pixel pointer so it points where its intended

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

avfilter/vf_removelogo: fix offset for accessing pixels above and below

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

avfilter/vf_removelogo: use av_freep() for saftey

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

avformat/movenc: set XDCAM codec tag correctly

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

avformat/movenc: set pretty compressor name for XDCAM

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

avformat/movenc: make AVStream easier to access

This adds a AVStream pointer to Track

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

doc/codecs: Add missing mpeg2 aac profiles

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

doc/codecs: Add ignorecrop

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

doc/codecs: Remove no longer existing options

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

doc/codecs: Cosmetics in the flags2 description

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

doc/codecs: document skip_alpha

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  prores: Reject negative run and level values

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

doc/filters/scale: do not explicitly state the default swscale flags value

This is done is order to avoid the need of synching scale with libswscale
docs in case the libswscale default changes.

lavf/riff.c: Fix GeoVision H.264 fourcc.

Fixes d24da748

Add H.264 fourcc GAVC for GeoVision cameras.

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mxf: Add jpeg2000 codec to intra only codecs

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

Merge commit '5f5ada3dbf97e306a74250ba8dcf8619ad59b020'

* commit '5f5ada3dbf97e306a74250ba8dcf8619ad59b020':
  shorten: Fix out-of-array read

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

Merge commit 'ed796fba761f4794bec7735d467c1b2c8e1858fe'

* commit 'ed796fba761f4794bec7735d467c1b2c8e1858fe':
  atrac3: Better name for IMDCT window initialization
  atrac3: Remove unused gain compensation tables

See: 2d52834910a4a043d150fc3fce9a06372d5aa108
See: 4fb8de08e1107db9a42fd4e6e4a72a8ebc5439fa
Merged-by: Michael Niedermayer <michaelni@gmx.at>

ffmpeg: set the source_index for trivial filter graphs

Fixes one testcase in Ticket2969

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

prores: Reject negative run and level values

Sample-Id: 00000611-google

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

avcodec/exr: remove pointless initialization

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

atrac3: Better name for imdct window initialization

Patch by Diego Biurrun.

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

atrac3: Remove unused gain compensation tables

Patch by Diego Biurrun.

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

mxf: Add jpeg2000 codec to intra only codecs

Conform with SMPTE RP 224 and SMPTE s422.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

shorten: Fix out-of-array read

pred_order == FF_ARRAY_ELEMS(fixed_coeffs) is invalid too.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

swscale: Use full resolution chroma for yuv2rgb when the input has full chroma

See Ticket3028

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

avfilter/vf_w3fdif: do not reset pts to 0

Shamelessly stolen from yadif.

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

doc/codecs: Document field_order

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

atrac3: Better name for IMDCT window initialization

Signed-off-by: Diego Biurrun <diego@biurrun.de>

atrac3: Remove unused gain compensation tables

Signed-off-by: Diego Biurrun <diego@biurrun.de>

doc/encoder/aac: Remove -cutoff trick

Fix Ticket #2686 comment 155.

Trick obsoleted since 72dabdfc58064fcb249f26fc7afca2221f18a832.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

libavcodec/x86: Fix emulated_edge_mc SSE code to not contain SSE2 instructions on x86-32.

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

avcodec/proresdec2: propagate error codes

Based-on: 44690dfa683f620c77e9f0e8e9bc5682608636b1
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/vmnc/reset_buffers(): reset cur_hx/hy too for saftey

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  prores: Error out only on surely incomplete ac_coeffs

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

Merge commit '44690dfa683f620c77e9f0e8e9bc5682608636b1'

* commit '44690dfa683f620c77e9f0e8e9bc5682608636b1':
  prores: Add a codepath for decoding errors

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