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

* commit 'e807491f':
  mpeg12dec: avoid signed overflow in bitrate calculation
  mpegvideo_parser: avoid signed overflow in bitrate calculation

This merge is a noop.

2017-04-29 12:54:15     @ubitux michaelni: is 740959fd enough to fix the overflow fixed in 58405de0?
2017-04-29 12:55:53     @ubitux same question with e807491f
2017-04-29 13:21:45     michaelni       ubitux, the libav code refered to is wrong for us and i doubt the problem it fixes applies to us.
2017-04-29 13:24:29     @ubitux michaelni: ok, for both commits?
2017-04-29 13:33:55     michaelni       yes, they do more or less the same thing
Merged-by: Clément Bœsch <u@pkh.me>

* commit '46191a2d':
  mov: fix a possible invalid read in mov_read_mac_string()
Merged-by: Clément Bœsch <u@pkh.me>

* commit 'cfa4eb4f':
  vaapi_decode: use the correct logging context

This commit is a noop, see 79307ae5Merged-by: Clément Bœsch <u@pkh.me>

* commit 'ea8b730d':
  hevcdec: add a VAAPI hwaccel

This commit is a noop, see adb54e59Merged-by: Clément Bœsch <u@pkh.me>

* commit '1783d7ec':
  Changelog: add some missing entries
Merged-by: Clément Bœsch <u@pkh.me>

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

find_fps attempts to infer framerate from AVCodec's timebase. When this
results in a frame rate that isn't explicitly marked as supported in
av_timecode_check_frame_rate, find_fps returns the AVStream's
avg_frame_rate, which, per avformat.h, _may_ be set (or not).

mov_get_mpeg2_xdcam_codec_tag, mov_get_h264_codec_tag and
find_compressor attempt to call av_q2d on the return value of find_fps,
which in the above case, may result in division by zero and therefore,
an undefined frame rate when NaN is converted to int.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

this was added in 1.6.0
Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com>
Signed-off-by: James Zern <jzern@google.com>

allow protocols other than file to be used
for example, use data protocol to embed a file in script
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>

Fixes Coverity CID: 1405135
Reviewed-by: Rodger Combs <rodger.combs@gmail.com>
Signed-off-by: Steven Liu <lq@chinaffmpeg.org>

fix ticket id: #6353
Signed-off-by: Steven Liu <lq@chinaffmpeg.org>

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>

They were introduced by f16180f4

Fixes undefined behavior
Fixes: 1275/clusterfuzz-testcase-minimized-6718162017976320

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpegSigned-off-by: Michael Niedermayer <michael@niedermayer.cc>

Fixes: 1271/clusterfuzz-testcase-minimized-6095220498235392

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpegSigned-off-by: Michael Niedermayer <michael@niedermayer.cc>

compilers doing DCE at -O0 do not necessarily understand "complex" boolean expressions
Build succeeds with this change, this was the only failure
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

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

Most code between the 2 functions was duplicated which made keeping
both in sync difficult.

This also fixes some discovered issues with encoding (incorrect
TF switching buffers) and reduces stack usage (reuse the already
allocated CeltFrame->scratch buffer for the quantized coefficients).
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>

Removes the last style issues with opus_pvq.c
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>

Removes unneeded variables, renames confusing and innacurate variables
and rewrites and slightly optimizes hadamard interleave/deinterleave
functions.
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>

This patch aims to reduce the number of input/output surfaces
NVENC allocates per session. Previous default sets allocated surfaces to 32
(unless there is user specified param or lookahead involved). Having large
number of surfaces consumes extra video memory (esp for higher resolution
encoding). The patch changes the surfaces calculation for default, B-frames,
lookahead scenario respectively.

The other change involves surface selection. Previously, if a session
allocates x surfaces, only x-1 surfaces are used (due to combination
of output delay and lock toggle logic). To prevent unused surfaces,
changing surface rotation to using predefined fifo.
Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>

Regression since 76cc100a.
Spotted-by: James Almer <jamrial@gmail.com>

* commit 'd4a91e65':
  pthread_frame: do not run hwaccel decoding asynchronously unless it's safe

This commit is a noop, see e0cd598bMerged-by: Clément Bœsch <u@pkh.me>

* commit '8dfba25c':
  pthread_frame: ensure the threads don't run simultaneously with hwaccel

This commit is a noop, see 14bb15bfMerged-by: Clément Bœsch <u@pkh.me>

* commit '373fd76b':
  hevcdec: do not set decoder-global SPS prematurely
Merged-by: Clément Bœsch <u@pkh.me>

* commit '0fea8555':
  v4l2: use codec descriptors for mapping a codec name to id
Merged-by: Clément Bœsch <u@pkh.me>

* commit 'ee480790':
  build: Add name parameter to check_lib() helper function
Merged-by: Clément Bœsch <u@pkh.me>

* commit '1faffe7e':
  configure: Disentangle vfw32 and user32 lib handling
Merged-by: Clément Bœsch <u@pkh.me>

* commit 'f7174d7e':
  configure: fix linking with MSVC when using --disable-optimizations
Merged-by: Clément Bœsch <u@pkh.me>

* commit 'ef9a711b':
  configure: put d3d11 check in alphabetical order
Merged-by: Clément Bœsch <u@pkh.me>

* commit 'a4fec9a7':
  rtmppkt: Check for packet size mismatches

See 7d57ca4dMerged-by: Clément Bœsch <u@pkh.me>

* commit 'cdcfa97d':
  libavformat: Fix a faulty api deprecation guard in prepare_input_packet
Merged-by: Clément Bœsch <u@pkh.me>

* commit '2425d732':
  arm64: replace 'bic' with immediate with 'and' with inverted immediate
Merged-by: Clément Bœsch <u@pkh.me>

* commit '05a603a9':
  ppc: Merge types_altivec.h into util_altivec.h
Merged-by: Clément Bœsch <u@pkh.me>

* commit 'ea7ee4b4':
  ppc: Centralize compiler-specific altivec.h #include handling in one place
Merged-by: Clément Bœsch <u@pkh.me>

* commit '39929e55':
  ppc: hevcdsp: Use shorthands for vector types
Merged-by: Clément Bœsch <u@pkh.me>

* commit '554e55bb':
  decode.h: Add missing headers to fix standalone compilation
Merged-by: Clément Bœsch <u@pkh.me>

* commit '343e2833':
  pthread_frame: use better memory orders for frame progress

This commit is a noop, see c358c625Merged-by: Clément Bœsch <u@pkh.me>

* commit 'e94b9313':
  fate: Add h264 test for frame num gaps

This commit is a noop, see b7e4ea0cMerged-by: Clément Bœsch <u@pkh.me>