* commit '303fadf5963e01b8edf4ba2701e45f7e9e586aeb':
avconv: Document the -init_hw_device option
avconv: Enable generic hwaccel support for VDPAU
lavc: vdpau: add support for new hw_frames_ctx and hw_device_ctx API
lavc: Add hwaccel_flags field to AVCodecContext
avconv: Enable generic hwaccel support for VAAPI
avconv: Generic device setup
hwcontext: Make it easier to work with device types
hwcontext: Add device derivation
This commit is a noop, see
b22172f6f3530b8bd9d1d2c38a31b1e9c3729e42
0b1794a43e1083644aa3db2a09323681cfe080ec
06043cc0bc72b530db352a67776392cf61a54104
be510733523016aae7dca74bba6aa3b223c1fed6
156bd8278f4098426cffaa68efb161907e5c1869
7e4ba776a2240d40124d5540ea6b2118fa2fe26a
e462ace84b92e54d2a5fa651d6469aefe0f1efbf
527a1e213167123d24d014bc0b956ef43d9d6542
Merged-by: James Almer <jamrial@gmail.com>
* commit 'cfee5e1a0fa892fadd19b8848545d62f2386a6e7':
build: Add missing object dependency for extract_extradata bitstream filter
This commit is a noop, see f8e29a371622316c68db7017ab04dd447b0114ba
Merged-by: James Almer <jamrial@gmail.com>
* commit '7995ebfad12002033c73feed422a1cfc62081e8f':
arm/aarch64: vp9: Fix vertical alignment
This commit is a noop, see 21c89f3a26bb1331381b90e653277585447cfbb3
Merged-by: James Almer <jamrial@gmail.com>
* commit '827a05eaa9482e9ac2a17f7f2e42ead07c1d7574':
matroskaenc: add support for Spherical Video elements
See 58eb0f57f6702d57b6f97ec5010657bb2c076eff. Merged for cosmetics
purposes.
Also includes changes from d32d59bc977b43031007bb2ab21e232f96d2ebcb
Merged-by: James Almer <jamrial@gmail.com>
* commit '994c4bc10751e39c7ed9f67ffd0c0dea5223daf2':
x86util: Port all macros to cpuflags
See d5f8a642f6eb1c6e305c41dabddd0fd36ffb3f77
Merged-by: James Almer <jamrial@gmail.com>
* commit '522d850e68ec4b77d3477b3c8f55b1ba00a9d69a':
h264_cavlc: check the value of run_before
[10:00:09] <jamrial> michaelni: what do you think of libav commit
522d850e68?
[10:00:45] <jamrial> it applies, but i can't reproduce the invalid
reads with the sample from the ticket mentioned in it
[10:52:57] <michaelni> jamrial, if theres an issue it should be fixed
by enlarging the scantable (as its faster) or maybe you can even drop
the if/else and use vlcs that are never returning a out of range
value. Id say the FFMIN is wrong in all cases, it should be a error
return if a check is added not silently continuing
[11:22:11] <michaelni> jamrial, i think the mb_padding stuff we have
makes it unneeded but we can possibly improve it beyond what we have
This commit is a noop
Merged-by: James Almer <jamrial@gmail.com>
Sets the correct start padding value when an edit list is present.
A new fate test is added, fate-mov-440hz-10ms, to ensure this is
handled correctly.
Signed-off-by: Dale Curtis <dalecurtis@chromium.org>
Reviewed-by: Sasi Inguva <isasi-at-google.com@ffmpeg.org>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* commit '83b2b34d06e74cc8775ba3d833f9782505e17539':
h2645_parse: use the bytestream2 API for packet splitting
Merged-by: James Almer <jamrial@gmail.com>
* commit 'b76f6a76c6312dc551d7c37c6ded36bea7973c74':
h264dec: initialize field_started to 0 on each decode call
This commit is a noop
Merged-by: James Almer <jamrial@gmail.com>
transfer_func variable passed to retry_transfer_wrapper
are h->prot->url_read and h->prot->url_write functions.
These need to return EOF or other error properly.
In case of returning >= 0, url_read/url_write is retried
until error is returned.
Signed-off-by: Daniel Kucera <daniel.kucera@gmail.com>
Otherwise the frame size of the codec is not set in the buffersink.
Fixes ticket #6603 and the following simpler case:
ffmpeg -c aac -filter_complex "sine=d=0.1,asetnsamples=1025" out.aac
Signed-off-by: Marton Balint <cus@passwd.hu>
* commit '3a0d5e206d24d41d87a25ba16a79b2ea04c39d4c':
arm/aarch64: vp9itxfm: Skip loading the min_eob pointer when it won't be used
arm: vp9itxfm: Template the quarter/half idct32 function
This commit is a noop, see
b7a565fe71d16747209bd66955a54c9b54abc5dd
70317b25aa35c0907720e4d2b7686408588c07aa
Merged-by: James Almer <jamrial@gmail.com>
Ported from libav. Authored by one of the following:
Anton Khirnov <anton@khirnov.net>
Diego Biurrun <diego@biurrun.de>
Vittorio Giovara <vittorio.giovara@gmail.com>
Reviewed-by: kierank
Signed-off-by: James Almer <jamrial@gmail.com>
* commit '5f794aa1653aa04c1da7397e9ccacad947fadf5f':
Add Cineform HD Decoder
See 3485332bf99602910fe8830b0230d02fc653135d.
Some cosmetics are merged. The refactoring is not merged at the
request of Kieran Kunhya.
Merged-by: James Almer <jamrial@gmail.com>
* commit 'f6790b5e1075133ee39be91105f1135db7afd259':
add initial QP value options
This commit is a noop, see 5f44a4a0a97e802479e6ce689d719e5277267f22
Merged-by: James Almer <jamrial@gmail.com>
* commit '8a60bba0aef77015111570058d5a72f0428dc748':
avcodec: clarify some decoding/encoding API details
This commit is a noop, see f940492bb241d1cf27175f40e580c51c20d6ebc3
Merged-by: James Almer <jamrial@gmail.com>
Use the appropriate metadata filter for each codec - in the absence of any
options to modify the stream, the output bitstream should be identical to
the input (though the output file may differ in padding).
All tests use conformance bitstreams, the MPEG-2 streams are newly added
from the conformance test streams
<http://standards.iso.org/ittf/PubliclyAvailableStandards/ISO_IEC_13818-4_2004_Conformance_Testing/Video/>
(cherry picked from commit 3cae7f8b9baaf43789490b676d8f5825f2e1bc2c)
(cherry picked from commit fbd63170bcbc5cad8965edad7c357f6eb4132250)
This should be ticks, not time_scale steps - it was wrong for all
framerates not a multiple of 1/2.
(cherry picked from commit 30645174e333c7db1946ab09be769db9be9d7481)
This will be used later in both the mpeg2_metadata filter and the
VAAPI MPEG-2 encoder. Also adds a unit test.
(cherry picked from commit b5859e0b04bdbe12c97cb12ac10a45d51d2d73c9)
This is able to modify some header metadata found in the VPS/SPS/VUI,
and can also add/remove AUDs.
(cherry picked from commit b31a9eae0233325c4b382c657f4b687d5d8b0812)
This applies a specific fixup to some Blu-ray streams which contain
redundant PPSs modifying irrelevant parameters of the stream which
confuse other transformations which require correct extradata.
A new single global PPS is created, and all of the redundant PPSs
within the stream are removed.
(cherry picked from commit e6874bc3af2f09af39b5d91b9c5f9ded67459696)
This is able to modify some header metadata found in the SPS/VUI,
and can also add/remove AUDs and insert user data in SEI NAL units.
(cherry picked from commit 9e93001b6135a23fe4e200196c08fb4fbffed6fc)
(cherry picked from commit c42b62d1f9641f10ffc23cad9abbe47d8a4a165b)
Supports all streams that the coded bitstream infrastructure does
(currently H.264, H.265 and MPEG-2).
(cherry picked from commit f11d8a5e8b185340cc50fcbc8a1437b0fbe7e931)
