* commit '4e649debcf7f71d35c6b38cdb7ee715eba95d64a':
Postpone API-incompatible changes until the next bump
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
* commit '2f9b652e8c646eabef74a6742f0d7d4c9118fd0e':
lavu: Drop deprecated context size variables
These variables had been previously un-deprecated in ffmpeg, not removed.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
* commit '2f8cbbc962dfc0dc1dd0a90b2cd6c21266380f51':
lavu: Drop deprecated external access to AVPixFmtDescriptor table
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
* commit '183db02a51a422568084b113a7571c845ca68622':
lavu: Drop deprecated old_pix_fmt.h and related code
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
* commit '069713aa4b137781e270768d803b1f7456daa724':
lavc: Drop deprecated thread opaque and codec pkt
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
* commit '9f90b24877016e7140b9b14e4b1acee663bb6d8a':
lavc: Drop deprecated get_buffer related functions
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
* commit '01bcc2d5c23fa757d163530abb396fd02f1be7c8':
lavc: Drop deprecated destruct_packet related functions
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
* commit 'dc70c19476e76f1118df73b5d97cc76f0e5f6f6c':
lavc: Drop deprecated request_channels related functions
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
* commit '11b2eed43e91b35b8295ed47115cae2e29bd687d':
lavr: Drop deprecated context reinitialization if resampling was not enabled
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
* commit 'c457bdebe7af643b380aa0f6add3cb4335d218dc':
checkasm: Fix floating point arguments on 64-bit Windows
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
* commit 'b1abd2aaf91be249f24cb74db9c205d9e4ca9da6':
vf_scale: Add an option to pass the scaler params
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
* commit 'c23999be134bde0a0554261a9043be7dbc01de0c':
avconv_opt: Add an option that lists all supported hwaccels
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
* commit '413d4e54a9bffe2d0afdc6d8a80f516e5df6a421':
nvenc: Properly free the fifos
Not merged, ffmpeg's nvenc doesn't use these fifos.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
* commit '2157df425bd909854fd4afcec4aa3311d8a3b31b':
hlsenc: Support outputting specific versions
Not merged, the version is auto-selected in ffmpeg based on enabled features.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
* commit '167ea1fbf15ecefa30729f9b8d091ed431bf43bd':
xavs: Do not try to set the bitrate tolerance without a bitrate
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
* commit 'f9ab4fe1f7c1e9d410ca5ee2c9ff8d2892aad068':
h264: Discard currently unsupported registered sei
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
* commit '47b447aaff1bc30ba986ca757346a2c5c95b786a':
imgutils: Fix a typo in avcodec_get_pix_fmt_loss
Not merged, this code was refactored and moved to avutil.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
* commit 'd8ebb6157d12183ed3fc987cd2ba18b404758828':
hevcdsp: fix a function name
Not merged, ffmpeg has no function of this name anymore.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
* commit 'e13da244f41610ee073b2f72bcf62b60fa402bb5':
checkasm: x86: properly save rdx/edx in checked_call()
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
* commit '317cfaa5e09755ed0b34af512ec687963a67bdbf':
asfdec: prevent the memory leak in the asf_read_metada_obj
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
* commit '58c3720a3cc71142b5d48d8ccdc9213f9a66cd33':
fate: Make sure a corner-case for ASF is covered
Adjusted fate ref to match the different timebase of the ffasf demuxer
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
* commit '72839fce6457fdb5d51b4a5381ac52914ee66389':
hlsenc: Use AV_TIME_BASE units for all the computations
Not merged, duration/time computation is handled quite differently in ffmpeg's hlsenc
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
* commit '7bf9647264308d2df74b2b50669f2d02a7ecc90b':
vp7: bound checking in vp7_decode_frame_header
Only partially merged, see 46f72ea507
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
* commit 'f34b152eb7b7e8d2aee57c710a072cf74173fbe1':
libfdk-aacdec: Clean up properly if the init fails
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
* commit '87de6ddb7b7674e329d5c96677bd8685bc7f7855':
libfdk-aacdec: Bump the max number of channels to 8
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
* commit '26ac22e5e7394346e9d59f800e7d4e91f4518d33':
movenc: Add a new flag for writing global sidx indexes for dash
Conflicts:
libavformat/movenc.c
libavformat/movenc.h
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
* commit 'f5e486f6f8c242bb2be01ad3ae952b5733ba1113':
x86inc: Fix instantiation of YMM registers
See e93d3a22cb
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
* commit 'b114d28a18050b5ebd22fc067332e5487243889c':
x86inc: warn when instructions incompatible with current cpuflags are used
See a1684311b3
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
* commit '9f1245eb9620a70feaa00ba745c6c7a56a839556':
x86inc: Support arbitrary stack alignments
See 826790f596
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
* commit '8c75ba55a4367c854b577c849ea2195bd78c4c81':
x86inc: warn if XOP integer FMA instruction emulation is impossible
See 8db0f71b49
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
* commit '8f4a06faf45c1cbcabec610f4b47824171379934':
checkasm: Remove unnecessary include
See 5e8e121fcc
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
* commit '5f200bbf98efe50f63d0515b115d2ba8dae297bc':
movenc: Place the sidx index after the initial moov/mdat pair
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
* commit '8e34089e265a6b01e1e3301e8864439d26793753':
movenc: Check that frag_info entries exist in mov_write_sidx_tag
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
* commit '1542ec96389f32e5081c6c607e4b6f5e257ccdf2':
cosmetics: Drop spurious spaces from if clauses
Conflicts:
libavcodec/vc1_block.c
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
* commit '0f562f5b833d603e04123d198c59f8b2b5eb43e4':
h264: Do not print an error when the buffer has to be refilled
Conflicts:
libavcodec/h264.c
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
* commit '9469370fb32679352e66826daf77bdd2e6f067b5':
h264: Use AVERROR return codes instead of -1
Only partially merged, as the first hunk is not correct and would result
in endless log spam.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
* commit '98c9ade9853a9c413534ef243174d65f3f7506fa':
drawtext: Move the strftime expansion in a separate function
Not merged, the code does not exist anymore.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
The FILE struct is opaque in MSVC 2015, and the members of this struct
were never meant to be accessed in any case.
No conditions are known where this check was needed to get characters
from stdin.
ucNumDeltaPocsOfRefRpsIdx needs to contain the flat value from the SPS RPS,
and not the final computed value from the slice header RPS, as this calculation
is done internally by the driver again.
Sample-Id: http://trailers.divx.com/hevc/Sintel_4k_27qp_24fps_1aud_9subs.mkvi
* commit 'fdbc544d29176ba69d67dd879df4696f0a19052e':
asfdec: prevent the memory leak while reading metadata
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
* commit '979cb55103fa8e8274806e496901203742c686d1':
hevc: Split the sei parsing in 3 functions
Conflicts:
libavcodec/hevc_sei.c
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
* commit '043f46f5741e1a5caedf55d788e1a72aae3b7605':
hevc: Use switch instead of if-nests in decode_nal_sei_message
Conflicts:
libavcodec/hevc_sei.c
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
* commit '2cd841c0776535be56e4db67485fdd9509c9b9f4':
hevc: Use a proper enum for the SEI values
Conflicts:
libavcodec/hevc_sei.c
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes