* commit '1e93c1e30ff0e8bf6094a426ca60f005e9cdaed3':
avconv: do not set encoder options when streamcopy is used
This chunk was removed in 955b818cf9
already.
Merged-by: Clément Bœsch <u@pkh.me>
* commit '17e7c03e12d1e4490921e7bffaeaa6b46a7ada4e':
h264: only allow ending a field/starting a new one before finish_setup()
This commit is a noop. According to Michael, after 8385e171 this commit
should not be necessary anymore.
Merged-by: Clément Bœsch <u@pkh.me>
* commit 'f966498e433fead2f5e6b5b66fad2ac062146d22':
h264: decode the poc values from the slice header into the per-slice context
Merged-by: Clément Bœsch <u@pkh.me>
* commit '54dd9b1cdd9e54f1ee39ae25af0324f8aba2831b':
h264: set mb_aff_frame in frame_start()
h264: move the block starting a new field out of slice_header_parse()
Both commits are merged at the same time in order to prevent a
regression with Ticket #4440 (see 38660128).
Merged-by: Clément Bœsch <u@pkh.me>
There is actually a need for the origin and end point not to be defined.
We can not automatically insert them with the y value of the first and
last point as it will influence the curves in a wrong way.
Fixes#5397
* commit 'd78fd2fa21cde28465e40dd0be4446b1387d22a6':
Add MagicYUV decoder
Changes observed from Libav:
- many cosmetics (function renames/move, spacing, line breaks)
- MagicYUVContext.slices_size is now unsigned
- use of pixdesc (include fixed in FFmpeg)
- mention of "Lossless" in the long name dropped (also removed from
general.texi in FFmpeg)
- addition of the FF_CODEC_CAP_INIT_THREADSAFE caps
- use of qsort() instead of AV_QSORT() (NOT MERGED)
- use of AVCodecContext.{width,height} instead of AVCodecContext.coded_{width,height} (NOT MERGED)
See also 77f9c4b7aa
Merged-by: Clément Bœsch <u@pkh.me>
* commit 'a2ddfadc2d9e91cf70aa7430a7340b418bdb5b42':
avdevice: Ignore timefilter test program
This commit is a noop, /timefilter entry was added in the original merge
(5d48e4eafa)
Merged-by: Clément Bœsch <u@pkh.me>
* commit 'd6c2c2796d8885e99fc90793cdd7937826f82fab':
LICENSE: Fix silly typo
This commit is a noop, the typo disappeared when the whole paragraph was
reworked in 484aec4da3.
Merged-by: Clément Bœsch <u@pkh.me>
* commit '05a4bacbf7ece618553d339afe1d0b57bc87aea8':
avpacket: Error out when creating 0-sized side data
This commit is a noop, see 5a633ec2dd
AV_PKT_DATA_METADATA_UPDATE can be zero sized in order to clear old
meta.
Note: maybe we could add a start or end marker.
Merged-by: Clément Bœsch <u@pkh.me>
* commit '61f168ae348f94f39e7afc6971654455a5de0e4d':
h264: factor out setting the parameter sets for a frame
Michael's changes on top of the merge undo parts of the original diff
that are not factorization:
"The call point is left where it was before. Such a change should be in
a separate commit and has multiple issues, one being null pointer
dereferences the other is that some safety checks would become
conditional.
I tried to split the PPS init between the new and old functions
similarly to the SPS code."
Merged-by: Clément Bœsch <u@pkh.me>
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
* commit '20a8c78ce0a5baf37f6a94e2d1e57e186b6f4b54':
avconv: Do not copy extradata if source buffer is empty
This commit is a noop, see 4d02dfbde4
Merged-by: Clément Bœsch <u@pkh.me>
* commit '38f99017e69bd25e88be87117237c29727c25635':
vp9: Return the correct size when decoding a superframe
This commit is a noop, see c2f3715cb3
Merged-by: Clément Bœsch <u@pkh.me>
* commit 'b2d5d6a7f20a255a5f3c9bf539cc507afd909ce5':
build: Only enable symbol reduction if the compiler does proper DCE
Merged-by: Clément Bœsch <u@pkh.me>
* commit '3399a26d3f57d462e839c0ee51223ae9aca20852':
nvenc: allow setting the number of slices
nvenc: De-compensate aspect ratio compensation of DVD-like content.
nvenc: list the major contributors in the copyright header
configure: Don't require nonfree for nvenc
nvenc: drop the hard dependency on CUDA
nvenc: only support HW frames when CUDA is enabled
nvenc: write the VUI signal properties for HEVC
nvenc: only write the VUI signal type fields if they are set
nvenc: Generate bufferingPeriod/pictureTiming SEI
nvenc: Delay frame output to increase encoding speed
nvenc: add support for lossless encoding
nvenc: Generate AUD NAL units for better compatiblity
nvenc: fix the rc option definitions
All these commits are noop as requested by Timo Rothenpieler.
<BtbN> andrey_turkin, ubitux, yeah, I like the current state of nvenc in
ffmpeg, I think most remaining differences should be merged on the libav
side of things. At least I'm not aware of anything that's missing in
ffmpeg.
Merged-by: Clément Bœsch <u@pkh.me>
* commit '65dc7ca4c8e7e56362626a5d31e563e80108f104':
Add release notes for 12.
This commit is a noop, but we absolutely need someone to write the
release notes.
Merged-by: Clément Bœsch <u@pkh.me>
* commit 'c0f4c7db9fea1c07d290a298b8db858b7ceed96d':
configure: move the hardware accel libs' entries in the help text
Merged-by: Clément Bœsch <u@pkh.me>
* commit '5e2203448ab4cc8ea1d933b87f1b39b009201044':
configure: improve the help text for external libraries
Only merged the explanation paragraphs. The removal of "enable/disable"
and "[no]" would create too much inconsistency and might cause
confusion.
Merged-by: Clément Bœsch <u@pkh.me>
This is definitely not complete.
Anton, Diego and Luca are still maintaining their code in Libav, but are
unwilling to do so in FFmpeg, so removing these entries will prevent
them from getting poked by our users.
Måns, Justin, Kostya and Jason left both projects a while ago.
* commit '393596f9d51134d6e45d81ae129223f4faea1232':
mpegtsenc: stop impersonating ses in sdt
This commit also includes the needed FATE updates later spotted by
Martin Storsjö and fixed in 34effe816f on
Libav side.
Merged-by: Clément Bœsch <u@pkh.me>
* commit 'ffa190d0479d2370dd89c95692f822cbff2cc24c':
Move VLC and RL_VLC_ELEM structure definitions to a separate header
Merged-by: Clément Bœsch <u@pkh.me>
* commit 'd338abb664febbc2c7266af7818aab1f12dbc161':
mpeg4videodec: Call av_log() in check_marker() with AVCodecContext instead of NULL
This commit is a noop.
Since check_marker() is still in get_bits.h in FFmpeg and shared amongst
decoders, a similar but different change will be committed in the next
commit in to serve the same purpose of this one (that is, passing a
logging context to the av_log() in that function).
Merged-by: Clément Bœsch <u@pkh.me>
* commit 'e4b38878da6b38ef5ca54ce14be985d6ae088834':
Move check_marker() from get_bits to mpeg4videodec
Not merged, check_marker() is used in various other places in FFmpeg.
Merged-by: Clément Bœsch <u@pkh.me>
* commit '2fb1d17a5a6b6ff8da2434cde0fda821f06f608c':
x86inc: Enable AVX emulation in additional cases
This commit is a noop, see e428f3b30c
Merged-by: Clément Bœsch <u@pkh.me>
* commit '300fb0df84e9a563ed3b8a9b3d365abb6cf34600':
x86inc: Improve handling of %ifid with multi-token parameters
This commit is a noop, see 4bd5583ace
Merged-by: Clément Bœsch <u@pkh.me>
* commit '8d02579fae756336ae2a88d521e8cf2f6b436a2f':
x86inc: Fix AVX emulation of some instructions
This commit is a noop, see 42be240ad6
Merged-by: Clément Bœsch <u@pkh.me>
* commit 'ba3eb745cc236765c916b74b39c1874da5c3aefc':
x86inc: Fix AVX emulation of scalar float instructions
This commit is a noop, see 8dd3ee9ddd
Merged-by: Clément Bœsch <u@pkh.me>
* commit '8996515b137f962e3a8691241c285c96437b6c53':
avpacket: fix setting AVPacket.data in av_packet_ref()
This commit is a noop, see ed3a02547c
Merged-by: Clément Bœsch <u@pkh.me>
* commit 'e62ff72fc1052273deb708ba715f73e5187281d4':
lavc: make avcodec_open2() fail when the timebase is not set for encoding
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch