* commit 'd336bfcf':
  pixdesc: fix and extend doxy for av_pix_fmt_get_chroma_sub_sample()
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit 'c0c4d7a0':
  configure: Correctly add openssl cflags and libs
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '87a814fd':
  libavcodec: Add missing AVClass pointers
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '0e9c4fe2':
  lavc: Move pre_me to codec private options
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '5b6f42da':
  lavc: Move me_penalty_compensation to codec private options
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '2862b637':
  lavc: Move prediction_method to codec private options
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Fix memleak
Fixes CID1197065 part 2
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Fixes CID1271741
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

I think we missed the crypto in the default_whitelist in case of http. Otherwise encrypted HLS will fail with

[hls,applehttp @ 0x2af39c00] playlist[0] open_input [http://playertest.longtailvideo.com/adaptive/oceans_aes/oceans_aes-audio=65000-video=236000-14.ts], start_seq_no [1], cur_seq_no [14]

[hls,applehttp @ 0x2af39c00]    open_input curseqno [14] startseqno [1]

[hls,applehttp @ 0x2af39c00] HLS request for url 'http://playertest.longtailvideo.com/adaptive/oceans_aes/oceans_aes-audio=65000-video=236000-14.ts', offset 0, playlist 0

[NULL @ 0x2af3a200] KEY_AES_128 seg->key [http://playertest.longtailvideo.com/adaptive/oceans_aes/oceans.key] pls->key_url [http://playertest.longtailvideo.com/adaptive/oceans_aes/oceans.key]

[hls,applehttp @ 0x2af39c00]     open_input [KEY_AES_128]

[hls,applehttp @ 0x2af39c00]      : c->persistence [0]

[hls,applehttp @ 0x2af39c00]      : c->probing     [1]

[hls,applehttp @ 0x2af39c00]      : pls->input     [NULL]

[hls,applehttp @ 0x2af39c00]        using normal http path for URL [crypto+http://playertest.longtailvideo.com/adaptive/oceans_aes/oceans_aes-audio=65000-video=236000-14.ts]

[crypto @ 0x2aff7cc0] Protocol not on whitelist 'http,https,tls,rtp,tcp,udp!
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>

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

This fixes out-of-bounds writes causing segmentation faults.
Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Reviewed-by: Kieran Kunhya <kierank@obe.tv>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>

As it is already written in the documentation, BMD DeckLink cards
are capable of capturing 2, 8 or 16 audio channels (for SDI Inputs).
Currently the value is hardcoded to 2. Introduces new option.
Reviewed-by: Deti Fliegl <deti@fliegl.de>
Signed-off-by: Matthias Hunstock <atze@fem.tu-ilmenau.de>
Signed-off-by: Marton Balint <cus@passwd.hu>

Similar to AV_ZERO128, AV_COPY128 can use MMX instructions in x86

AV_ZERO64/128 can use MMX on x86.
Reviewed-By: James Almer <jamrial@gmail.com>

This fixes building on cygwin
Fixes ticket #5036

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Note to maintainers: update tools

Note to maintainers: set a default whitelist for your protocol
If that makes no sense then consider to set "none" and thus require the user to specify a white-list
for sub-protocols to be opened

Note, testing and checking for missing changes is needed
Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

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

The codec context field was rightly deprecated, and the data
may change per-frame.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

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

This reverts commit 8ed82d81.

SMPTE S377-1-2009c defines in F.4.1 that the Video Line Map should
always be an array with two 32 bit integers as elements. This is
repeated in G.2.12 with actual examples for progressive content,
where the second value would always be 0.

Additionally, the IRT MXF analyser also lists this as the only
error in the MXF output from ffmpeg: https://mxf-analyser-cloud.irt.deReviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

And check for bitexact output instead
Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>

Fixes compilation with TRACE enabled
Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>

This can cause problems with urls that have arguments after the filename

This reverts commit b0c57206.
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Fixes tickets #5208 and #5209

Fix trac ticket #5160.
Signed-off-by: Umair Khan <omerjerk@gmail.com>

Port of nnedi3 vapoursynth filter.
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>