* commit 'e807491fc6a336e4becc0cbc981274a8fde18aba':
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 740959fdbf enough to fix the overflow fixed in 58405de0951a843765625159402870c1eea3c3b1?
2017-04-29 12:55:53 @ubitux same question with e807491fc6
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 'cfa4eb4fba782f3f37a33be997b27a91a07053c9':
vaapi_decode: use the correct logging context
This commit is a noop, see 79307ae563
Merged-by: Clément Bœsch <u@pkh.me>
* commit 'ea8b730d8e67152107d7fcdd5590bbb51ec236b1':
hevcdec: add a VAAPI hwaccel
This commit is a noop, see adb54e59c1
Merged-by: Clément Bœsch <u@pkh.me>
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>
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>
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>
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>
* commit 'd4a91e65343be5d79a4afa61c791191e1b57499a':
pthread_frame: do not run hwaccel decoding asynchronously unless it's safe
This commit is a noop, see e0cd598bc4
Merged-by: Clément Bœsch <u@pkh.me>
* commit '8dfba25ce89b62c80ba83e2116d549176c376144':
pthread_frame: ensure the threads don't run simultaneously with hwaccel
This commit is a noop, see 14bb15bfd5
Merged-by: Clément Bœsch <u@pkh.me>
* commit 'f7174d7ed045445d00a6d557236737d09ad32343':
configure: fix linking with MSVC when using --disable-optimizations
Merged-by: Clément Bœsch <u@pkh.me>
* commit '343e2833994655c252d5236a3394bf6db7a4d8b1':
pthread_frame: use better memory orders for frame progress
This commit is a noop, see c358c62550
Merged-by: Clément Bœsch <u@pkh.me>
* commit 'e94b9313b21c3d91a36ef064f7fe3e867616f47f':
fate: Add h264 test for frame num gaps
This commit is a noop, see b7e4ea0c80
Merged-by: Clément Bœsch <u@pkh.me>
* commit '5c7f2cf81df06614f255f061850132355a01d75e':
h264_slice: Wait for refs to be available before we use them in error concealment
This commit is a noop, see 4413e950b2
Merged-by: Clément Bœsch <u@pkh.me>
* commit '86157e6db2c7a9222f77fa7e7f50fb9aebc3aa81':
hevc: decouple calling get_format() from exporting the SPS parameters
See 786032cad8 (which has been reverted
and replaced with Anton's version to reduce diffs between the two
projects).
Merged-by: Clément Bœsch <u@pkh.me>
* commit 'fa1749dd34c55fb997c97dfc4da9383c9976ab91':
vp9: split superframes in the filtering stage before actual decoding
This commit is a noop.
2017-04-24 20:45:04 @ubitux BBB: btw, do you think you can get the bsf thing this week or we should skip it to give you more time and go on with the merges?
2017-04-24 20:45:20 @BBB I’m not sure I’ll finish it that soon
2017-04-24 20:45:26 @BBB I’d skip it and leave it for later
2017-04-24 20:45:35 @BBB I’ll do it, I promise, but I Can’t guarantee it’ll be done by $date
Merged-by: Clément Bœsch <u@pkh.me>
The header is not always available in the docker build environment
Suggested-by: Kostya Serebryany
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
