* commit 'ac3c3ee678e51b05a2a7c30ce79465db46ba01fa':
dxva2: allow an empty array of ID3D11VideoDecoderOutputView
This commit is a noop, see 8fb4865901
Merged-by: Clément Bœsch <cboesch@gopro.com>
* commit 'f67235a28cef44fcd97ae74ad53bbbc0d7f63d60':
dxva2: get the slice number directly from the surface in D3D11VA
This commit is a noop, see 153b36fc62
Merged-by: Clément Bœsch <cboesch@gopro.com>
* commit '2a2889e130fee6d3c11e506328388afb317626ed':
build: Remove stray duplicate conditional variable declaration
This commit is a noop, there is no duplicate in FFmpeg. we have the
tools rules kept in the root Makefile though (see
802d94c36e)
Merged-by: Clément Bœsch <cboesch@gopro.com>
* commit '89725a8512721fffd190021ded2d3f5b42e20e2a':
vaapi_h264: Scale log2_max_pic_order_cnt_lsb with max_b_frames
This commit is a noop, see eefa4b76ee
Merged-by: Clément Bœsch <cboesch@gopro.com>
* commit 'a3c3a5eac20a51d402c332cdf5220fff40a7943f':
vaapi_encode: Support forcing IDR frames via AVFrame.pict_type
This commit is a noop, see c667c0979c
Merged-by: Clément Bœsch <cboesch@gopro.com>
* commit '37fab0661a760b2a9d727939d72e629acee1a6ef':
vaapi_encode: Fix GOP sizing
This commit is a noop, see 760f1a7727
Merged-by: Clément Bœsch <cboesch@gopro.com>
* commit 'bd6496fa07e32fd09ceb79404f9af43df959bcb2':
interplayvideo: Convert to the new bitstream reader
adx: Convert to the new bitstream reader
dvbsubdec: Convert to the new bitstream reader
motionpixels: Convert to the new bitstream reader
This merge is a noop, see
http://ffmpeg.org/pipermail/ffmpeg-devel/2017-April/209609.html
Merged-by: Clément Bœsch <u@pkh.me>
* commit 'e435beb1ea5380a90774dbf51fdc8c941e486551':
crypto: consistently use size_t as type for length parameters
Merged-by: Clément Bœsch <cboesch@gopro.com>
* commit 'e7de05f98f630b5b3a5e441c8fa763e6d89b8851':
h264dec: drop a redundant check
This commit is a noop, see 4cc1ce4a91
Merged-by: Clément Bœsch <cboesch@gopro.com>
* commit '3cba1ad76d362c994fa98fb686e04e20826fb579':
x86inc: Avoid using eax/rax for storing the stack pointer
This commit is a noop, see cd09e3b349
Merged-by: Clément Bœsch <cboesch@gopro.com>
* commit '4e62b57ee03928c12a3119dcaf78ffa1f4d6985f':
fate: Skip the checkasm test if CONFIG_STATIC is disabled
Merged-by: Clément Bœsch <cboesch@gopro.com>
* commit '2835e9a9fd2b355e7936d1024ff1bf5fe454e428':
hevcdec: add P010 support for D3D11VA
This commit is a noop, see ccb94789e2
Merged-by: Clément Bœsch <cboesch@gopro.com>
* commit '0ac2d86c4758e1419934905b6c092910296aa16a':
dxva2: Factorize DXVA context validity test into a single macro
This commit is (mostly) a noop, see 77742c75c5
Merged-by: Clément Bœsch <cboesch@gopro.com>
* commit 'f8a42d4f260db3eae4399fa8bd8c8c2c1d38f23a':
dxva2: Make ff_dxva2_get_surface() static and drop its name prefix
This commit is a noop, see fd0716b364
Merged-by: Clément Bœsch <cboesch@gopro.com>
* commit '9026ec8aaf5fa19cb4fb266c16f608af0d863b2b':
matroskadec: make sure not to leave EbmlBin in an inconsistent state
This commit is a noop, see 5e1bacf2d4
Merged-by: Clément Bœsch <cboesch@gopro.com>
* commit '9b1db2d33883c6ff3f8c7b2453146501ba14ca20':
vaapi_h264: Fix POC on IDR frames
This commit is a noop, see e72662e131
Merged-by: Clément Bœsch <cboesch@gopro.com>
* commit 'd08e02d929ff8be5f56bb1da0e439bf1ae557552':
vaapi_h265: Fix build failure with old libva without 10-bit surfaces
This commit is a noop, see b9514756ba
Merged-by: Clément Bœsch <cboesch@gopro.com>
* commit '85ad5ea72ce3983947a3b07e4b35c66cb16dfaba':
aarch64: vp9mc: Fix a comment to refer to a register with the right name
This commit is a noop, see 0ba0187535
Merged-by: Clément Bœsch <cboesch@gopro.com>
* commit '65074791e8f8397600aacc9801efdd17777eb6e3':
aarch64: vp9dsp: Fix vertical alignment in the init file
This commit is a noop, see 02cfb9a16e
Merged-by: Clément Bœsch <cboesch@gopro.com>
* commit 'c536e5e8698110c139b1c17938998a5547550aa3':
arm: vp9mc: Fix vertical alignment of operands
This commit is a noop, see 656d910981
Merged-by: Clément Bœsch <cboesch@gopro.com>
* commit 'd31f46e1999fab31be46f0cbce0546a5aa49fe48':
cmdutils: update copyright year to 2017
This commit is a noop, see d800d48fc6
Merged-by: Clément Bœsch <cboesch@gopro.com>
* commit 'ee164727dd64c199b87118917e674b17c25e0da3':
configure: Fix typo in incdir variable written to config.sh
This commit is a noop, see 6fdd35a312
Merged-by: Clément Bœsch <cboesch@gopro.com>
* commit '5c83b4d550ea42653fece092987bab56ccc32ead':
fate: Unset the sig variable if ignoring a test failure
Merged-by: Clément Bœsch <cboesch@gopro.com>
* commit '11a9320de54759340531177c9f2b1e31e6112cc2':
build: Move build-system-related helper files to a separate subdirectory
"ffbuild" directory name is used instead of "avbuild".
Merged-by: Clément Bœsch <u@pkh.me>
* commit 'f9edc734e0ca3f6ef06c1ad0bd2c19c0c66f1ffa':
ratecontrol: Drop xvid-rc-related struct members unused after a6901b9c6
This commit is a noop, see 99b35a51cc
Merged-by: Clément Bœsch <u@pkh.me>
* commit '5b26d3b789bd19a32dbe1e9c7ccab9498de7ee9b':
nvenc: Update check for lookahead
This commit is a noop, see 67db4ff3b6
Merged-by: Clément Bœsch <u@pkh.me>
* commit 'a0c443a3980dc22eb02b067ac4cb9ffa2f9b04d2':
aarch64: vp9itxfm: Use the offset parameter to movrel
This commit is a noop, see 8b11a89c06
Merged-by: Clément Bœsch <u@pkh.me>
* commit 'fc322d6a70189da24dbd445c710bb214eb031ce7':
tta: Convert to the new bitstream reader
mlp: Convert to the new bitstream reader
unary: Convert to the new bitstream reader
This merge is a noop, see
http://ffmpeg.org/pipermail/ffmpeg-devel/2017-April/209609.html
Merged-by: Clément Bœsch <u@pkh.me>
* commit '45286a625c6ced1f5c4c842244cbb4509429abba':
h264dec: make sure to only end a field if it has been started
This commit is a noop. Our h264 slicing handling is different and does
not seem to be affected by the issue.
Merged-by: Clément Bœsch <u@pkh.me>
* 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>
* 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>
* commit '6aa4ba7131b6e8668e33430e18101a051fe492eb':
dxva2: Keep code shared between dxva2 and d3d11va under the correct #if
Merged-by: Clément Bœsch <u@pkh.me>
* commit 'f1248fae90b45501af4e8743d373e79191470331':
configure: Handle dxva2 optional components in the standard way
Merged-by: Clément Bœsch <u@pkh.me>
* commit 'a6901b9c6bd51396c1159f1a07f9f5042328cda6':
Drop libxvid rate control support for mpegvideo encoding
This commit is a noop, there is no known issue with it.
Merged-by: Clément Bœsch <u@pkh.me>
* commit '7d81698b89172d2dcf1b78d4b42ba86262360559':
vaapi_h265: Fix CFR mode with framerate set in AVCodecContext
This commit is a noop, see 37de9ce713
Merged-by: Clément Bœsch <u@pkh.me>
* commit 'ade370a4d7eab1866b6023c91c135d27c77ca465':
lavfi: Add VAAPI deinterlacer
This commit is a noop, see 359586f14f
Merged-by: Clément Bœsch <u@pkh.me>
* commit '39fbcf8f76ff2e7cd8d09307e6aacc70ce8f5fed':
configure: Fix _libs vs. _extralibs oversight
This commit is a noop, see 9bf3d84089
Merged-by: Clément Bœsch <u@pkh.me>
* commit 'a7101eb40e69ada3872ec5aebe9c5c165745fb3a':
configure: Simplify some library checks via check_lib()
This commit is a noop as it doesn't apply to FFmpeg:
- the nanosleep check doesn't use add_extralibs in FFmpeg
- the pthread checks check multiple functions before add the extra
libraries
Merged-by: Clément Bœsch <u@pkh.me>
* commit '1818a640cfdccd52e97edf13564f45bc3d0d93eb':
build: Fix dependencies for alsa/jack/sndio support
Added explicit enable (which will be automatically added later on in
ee480790c) to actually fix this commit. Without the explicit enables,
alsa, jack and sndio gets disabled.
Also added jack, alsa and sndio to the have list so the HAVE_* are
populated to make (this fixes the SKIPHEADERS chunks).
Merged-by: Clément Bœsch <u@pkh.me>
* commit '6c916192f3d7441f5896f6c0fe151874fcd91fe4':
mimic: Convert to the new bitstream reader
metasound: Convert to the new bitstream reader
lagarith: Convert to the new bitstream reader
indeo: Convert to the new bitstream reader
imc: Convert to the new bitstream reader
webp: Convert to the new bitstream reader
This merge is a noop, see
http://ffmpeg.org/pipermail/ffmpeg-devel/2017-April/209609.html
Merged-by: Clément Bœsch <u@pkh.me>
* commit '14bba44fb23c63bf82b2c15f5c754b2fed7dbea9':
build: Drop support for configuring library name suffixes
This commit is a noop. The feature is useful. Until recently I was one
of these no known users.
Merged-by: Clément Bœsch <u@pkh.me>
* commit '1ea77aae927c7310034b1f75d4f1c2676fe641f2':
configure: Drop bogus xcb_event variables
This commit is a noop, see 50138ea4f7
Merged-by: Clément Bœsch <u@pkh.me>
* commit '33a2b73b98374de4781ae0497cf74b2ce07a9615':
mpeg4audio: correctly propagate meaningful error values
This commit is a noop, see 50b1453915
Merged-by: Clément Bœsch <u@pkh.me>
* commit 'a91f1023bc06091ef84dce0f1e12b72d7f3ba3ca':
examples: fix a typo in an error message
This commit is a noop, see 3aa1ff30f3
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch
Clément Bœsch