Merge commit 'f9f883af4fe615a832407a657752e248a96c6280'

* commit 'f9f883af4fe615a832407a657752e248a96c6280':
  h264: simplify code in flush_dpb()

Conflicts:
libavcodec/h264.c

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

ffmpeg_dxva2: add hevc support

Reviewed-by: compn <tempn@mi.rr.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Add DXVA2 HEVC HWAccel

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

hevc: reindent after previous commit

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

hevc: add hwaccel hooks

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

hevc: store the short term rps flag and size in the context

For future use by hardware accelerators.

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

hevc: store the escaped/raw bitstream in HEVCNAL

Hardware Accelerators require access to the escaped bitstream.

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

lavfi/lut: apply minor compute_gammaval709() doxy fix

h264: simplify code in flush_dpb()

There is no point in clearing reference explicitly, since that will be
done as a part of ff_h264_unref_picture() right below.

fate: Fix bitexactness for vsynth3-dnxhd-1080i-colr

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

avfilter/vf_eq: mark src as const

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

configure: use ar and ranlib in deterministic mode if available

this makes the static libraries binary reproducible

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avfilter/vf_eq: Fix clipping code

Found-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Revert "configure: use ar and ranlib in deterministic mode"

This breaks on BSDs

This reverts commit 7e857cd57108358531b62ba58daa79adf21878e5.

configure: use ar and ranlib in deterministic mode

this makes the static libraries binary reproducible

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/movenc: Add simplistic 'colr' tag writing support to mov container

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

tools/crypto_bench: add Camellia support

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

avcodec/nvenc: Fix b-frame parameter handling

This should behave similar to x264 and other encoders, as it handles a
gop_size of 0 as Intra-Only, while it's still possible to control how
many B-Frames it inserts.

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

Merge remote-tracking branch 'rdp/dshow_tv_tuner'

* rdp/dshow_tv_tuner:
  dshow: tweak logging
  dshow: crossbar dialog was frequently being displayed twice, split up option so it can be just once
  dshow: alert as to ramifications of switching crossbar routing
  dshow: add properties dialog for tv tuners

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

avfitler/vf_fieldmatch: fix typo

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

avfilter/libmpcodecs: remove unused headers

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

Decode Prores 4444 XQ with the existing Prores decoder.

The frames are said to contain a higher bit-depth but
users report that our decoder shows visually correct output.
Requested by forum user gregba and Christoph Gerstbauer.

lavfi/mp: drop mp=eq and mp=eq2

mp=eq2 was ported to a native libavfilter filter in commit
4c38e960d0ca81b78dec1589275a5274dde21c8e.

avfilter/vf_eq: fix leak of input frame

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

dshow: tweak logging

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>

dshow: crossbar dialog was frequently being displayed twice, split up option so it can be just once

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>

dshow: alert as to ramifications of switching crossbar routing

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>

dshow: add properties dialog for tv tuners

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>

fate: add Camellia test

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

Fix creation of ffprobe-test.nut on remote targets.

This is not sufficient to run "make fate-ffprobe" on a remote system:
The ffprobe output contains the relative path to the testfile, it is
necessary to run the test from the build directory.
One solution is to use a script like the following as --target-exec:
ssh target "cd /remote/build/directory; $(printf "%q " "$@")"

LICENSE.md: add vf_eq

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

avfilter: Port mp=eq/eq2 to lavfi

Code adapted from James Darnley's port
Some fixes from Paul B Mahol <onemda@gmail.com>

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

x86/sbrdsp: Use different mem moves

Before
2843 decicycles in ff_sbr_autocorrelate_sse3, 262086 runs, 58 skips

After
2693 decicycles in ff_sbr_autocorrelate_sse3, 262117 runs, 27 skips

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

x86/sbrdsp: add ff_sbr_autocorrelate_{sse,sse3}

2 to 2.5 times faster.

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

avfilter/vf_mcdeint: Set no_bitstream=1

This avoids unneeded writing of the bitstream

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

avfilter/vf_mcdeint: fix gop_size

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

avfilter/vf_uspp: fix gop_size

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

avfilter/vf_uspp: Use FF_CEIL_RSHIFT() correct rounding of odd w/h

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

avformat/movenc: Check failure of allocation of ctts_entries and propagate error

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

avformat/movenc: fix cleanup on insufficient reserved_moov_size

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

doc/APIchanges: fill in the remaining missing dates

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

ffmpeg: allow overriding and amending AVStream->disposition

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

avformat/matroskadec: Use av_malloc_array() for index_entries

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

avformat/matroskadec: Check av_mallocz() return values

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

nvenc: Propagate desired number of reference frames.

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

avdevice/dshow_crossbar: Avoid mixing declarations and statements

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

hevc: pass the full HEVCNAL struct to decode_nal_unit

This enables decode_nal_unit to access additional fields added in
subsequent commits.

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

avutil/pixdesc: rewrite AV_PIX_FMT_FLAG_PSEUDOPAL documentation

It seems many people do not understand its current documentation

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

doc/APIchanges: Fill in remaining missing hashes

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

ffmpeg_opt: expand format for strftime

While the shortened format specifiers are valid C99 ones, they are
not supported by e.g. some Visual Studio runtimes (and thus mingw).

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

ffserver: reflow find_stream_in_feed()

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>

ffserver: reindent handle_connection()

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>

ffserver: reflow handle_connection()

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>

ffserver: reindent http_vlog()

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>

ffserver: reflow http_vlog()

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>

lavc/libopenjpegenc: move opj_setup_encoder to libopenjpeg_encode_frame

if the openjpeg parameter tcp_rates is not 0 ( using the ffmpeg compression_level option )
every 2nd image per thread is badly encoded. By moving the opj_setup_encoder function from
libopenjpeg_encode_init to libopenjpeg_encode_frame this can be prevented.

This fixes ticket #3754.

Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge remote-tracking branch 'rdp/dshow_crossbar'

* rdp/dshow_crossbar:
  dshow: fix docu escapes
  dshow: some devices only list themselves under "Video sources" but actually have both video and audio output pins, so make the audio pins accessible by video source name.
  dshow: add options for allowing filter popup configuration dialogs to be presented to the user
  dshow: introduce support for crossbar [multiple input selectable] devices
  dshow: drop initial audio packets with weird timestamps
  dshow: use non deprecated api
  dshow: miscellaneous tweaks
  dshow: allow selecting devices by an alternative name (workaround for devices with symbols in them), allow specifying capture pins by name and alternative (unique) name

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

Merge commit '3a6dfec864d569c2d0a875e1a7466f51b00edb63'

* commit '3a6dfec864d569c2d0a875e1a7466f51b00edb63':
  segment: Check av_get_frame_filename() return value

Conflicts:
libavformat/segment.c

No changes as there was no unchecked av_get_frame_filename() in segment.c

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

Merge commit '7915e6741dbe1cf3a8781cead3e68a7666de14f4'

* commit '7915e6741dbe1cf3a8781cead3e68a7666de14f4':
  hlsproto: Properly close avio buffer in case of error

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

Merge commit '4c5fa628da099dbb598c93bc4555b8733d2c3035'

* commit '4c5fa628da099dbb598c93bc4555b8733d2c3035':
  mov: Do not compute negative SAR values

Conflicts:
libavformat/mov.c

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

Merge commit '2a06c2a03e1205aaeede5af850b9271752ddd4cf'

* commit '2a06c2a03e1205aaeede5af850b9271752ddd4cf':
  mpegvideo_enc: Draw edges on input for non-multiple of 16 resolutions

Conflicts:
libavcodec/mpegvideo_enc.c

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

avformat/dv: check av_malloc() return code

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

avformat/librtmp: Fix build with --disable-network --enable-librtmp

Found-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

dshow: fix docu escapes

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>

segment: Check av_get_frame_filename() return value

CC: libav-stable@libav.org
Bug-Id: CID 1265713

hlsproto: Properly close avio buffer in case of error

Fix a memory leak.

CC: libav-stable@libav.org
Bug-Id: CID 717999

mov: Do not compute negative SAR values

This partially reverts cf70ba37ba74089a18295b29e77dead0a3222c9e, since
it didn't take into account when rotation is 0, but there is another
valid operation (eg. translation) in the matrix.

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

doc/APIchanges: fill in more missing hash values and dates

all values before 2.5 seem to be filled in now

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

avfilter/af_channelmap: Check for missing argument in get_channel_idx()

Fixes null pointer dereference

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

dshow: some devices only list themselves under "Video sources" but
actually have both video and audio output pins, so make the audio pins
accessible by video source name.

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>

dshow: add options for allowing filter popup configuration dialogs to be presented to the user

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>

dshow: introduce support for crossbar [multiple input selectable] devices

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>

dshow: drop initial audio packets with weird timestamps

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>

dshow: use non deprecated api

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>

mpegvideo_enc: Draw edges on input for non-multiple of 16 resolutions

This improves motion estimation and avoids using uninitialized data
for resolutions that aren't a multiple of 16.

Prior to d2a25c40, the edges used to be initialized so that encoding
was deterministic, but after that commit it started using uninitialized
data (for non multiple of 16 resolutions).

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>

dshow: miscellaneous tweaks

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>

dshow: allow selecting devices by an alternative name (workaround for devices with symbols in them), allow specifying capture pins by name and alternative (unique) name

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>

libavformat/mov.c: Handle timecode from tmcd atom in counter mode

When the timecode value is in counter mode then it is important to use
the timescale and frameduration to calculate the timecode fps.

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

Merge commit '9108967513fcaff3d55514a7bca4c9fbba128c71'

* commit '9108967513fcaff3d55514a7bca4c9fbba128c71':
  rtspdec: Consistently use rtsp_hd_out for writing

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

rtspdec: Consistently use rtsp_hd_out for writing

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

avutil/buffer: factor buffer_replace() out

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

avcodec/h264: Partially decode and display single fields try #2

This like the previous attempt does not fully correctly decode this
type of non standard H.264, but it now works fully automatic
requiring no manual filters or flags to be used

See Ticket2254

Reviewed-by: Kieran Kunhya <kierank@obe.tv>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat: allow .264 as extension for raw H.264 stream

In addition to .h264, .264 is also commonly used by people to name raw H.264
streams. Enables automatic recognition of the h264 format for the .264
extension.

Signed-off-by: Werner Robitza <werner.robitza@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '6341ab0ad3fde9583138e121f518e21cde15258e'

* commit '6341ab0ad3fde9583138e121f518e21cde15258e':
  libx265: Pass through user-set frame type

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

avformat/mov: Stricter sanity checks on the display_matrix

Fixes "broken" tkhd
Found-by: koda
Tested-by: koda
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

libx265: Pass through user-set frame type

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

libx265: Pass through user-set frame type

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

avfilter/avf_showcqt: use av_malloc_array()

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

avfilter/drawutils: Check for av_malloc* failures

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

avfilter/drawutils: Use av_malloc_array()

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

avformat/flvenc: accept AVMEDIA_TYPE_SUBTITLE instead of DATA for subtitles

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

doc/APIchanges: Fill in some more missing hash values

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

avcodec/mpegvideo: also export 0,0 motion vectors

Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '3a724a7f3ba7fa766c6a6f0924a15cc742031b8d'

* commit '3a724a7f3ba7fa766c6a6f0924a15cc742031b8d':
  dashenc: Use inttypes.h macros for format strings instead of %lld

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

Merge commit '1d8aa23794cc63e9517d5055a2d48040b843b1cf'

* commit '1d8aa23794cc63e9517d5055a2d48040b843b1cf':
  dashenc: Fix format string generation

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

avformat/dashenc: fix format string generation

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

dashenc: Use inttypes.h macros for format strings instead of %lld

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

dashenc: Fix format string generation

Previously this always used the "lld" format for all parameters,
not only time parameters.

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

lavc/pnm: Support decoding ya16.

lavc/pamenc: Support encoding ya16be.