* commit '8e2346154e6d58b733fd20326ce706f82fd91b3e':
libavutil: Hook up the rest of the gcc specific attributes to clang as well
Merged-by: James Almer <jamrial@gmail.com>
* commit '3aa9c523e9cf4f4a5e239ac737281e096c884907':
libavutil: Define the noreturn attribute for clang in MSVC mode as well
Merged-by: James Almer <jamrial@gmail.com>
* commit 'a46a4f722d2fac07c57990f0f548777622599f59':
dca: Refactor dca_filter_channels() a little
dca: Validate the channel map
This commit is a noop, we have a different DCA decoder.
Merged-by: James Almer <jamrial@gmail.com>
* commit '3df77b58e35a30ed550f99936a308f6bd2f47a20':
nvenc: Allow different const qps for I, P and B frames
This commit is a noop, see 2db5ab73d4
Merged-by: James Almer <jamrial@gmail.com>
* commit 'ca960161f087ca38267b88ce90592010c59584f1':
rtsp: Move message parsing to a separate function
This commit is a noop, see 1e27837265
Merged-by: James Almer <jamrial@gmail.com>
* 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
b22172f6f30b1794a43e06043cc0bcbe51073352156bd8278f7e4ba776a2e462ace84b527a1e2131
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 f8e29a3716
Merged-by: James Almer <jamrial@gmail.com>
* commit '7995ebfad12002033c73feed422a1cfc62081e8f':
arm/aarch64: vp9: Fix vertical alignment
This commit is a noop, see 21c89f3a26
Merged-by: James Almer <jamrial@gmail.com>
* commit '827a05eaa9482e9ac2a17f7f2e42ead07c1d7574':
matroskaenc: add support for Spherical Video elements
See 58eb0f57f6. Merged for cosmetics
purposes.
Also includes changes from d32d59bc97
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
b7a565fe7170317b25aa
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 3485332bf9.
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 5f44a4a0a9
Merged-by: James Almer <jamrial@gmail.com>
* commit '8a60bba0aef77015111570058d5a72f0428dc748':
avcodec: clarify some decoding/encoding API details
This commit is a noop, see f940492bb2
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 3cae7f8b9b)
(cherry picked from commit fbd63170bc)
