* commit 'd6d78518018a12fb495baab5663708a830f3aab6':
g2meet: factor out seeking to the chunk end
Conflicts:
libavcodec/g2meet.c
See: 3f826039dd
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Reviewed-by: Lukasz M <lukasz.m.luki@gmail.com>
See: [FFmpeg-devel] Fix libssh static linkage on Windows
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
The buffer holding the coefficients must be padded with 0 so as to use DSP
functions that may overread. Currently, the SSE2/3 versions is an example,
as they process batches of 16 bytes.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* qatar/master:
rpza: limit the number of blocks to the total remaining blocks in the frame
See: 3819db745d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit 'a46dc49744bdc4f2e31725b63ac8e41f701e4fa1':
rpza: move some variables to the blocks where they are used
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit '394fb56c29eee7f4f8f0334d8b5d30d3c54ac703':
lavf: always unref the packet passed to av_interleaved_write_frame() on error
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit '54f7e79d4706a8343dad1d8da51b7d3d3b2cd3b2':
lavf: add some basic documentation of the muxing process
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit 'b36bc81ccaa2fc85dc4bae7dc546c71e8833573d':
avplay: add support for seeking to chapter marks
Conflicts:
doc/ffplay.texi
ffplay.c
ffplay uses pageup/down for seeking by +-10min
thus this use of the keys conflicts.
The merge thus uses them to seek to chapters when there are some or
+-10min when there are not
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Due to a wrong substitution doc/examples is not added as a prerequisite
for the objects of the example programs. This results in compiler error
due to the non-existing output directory.
Bug-Id: 636
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
Previously these type of streams were not returned even if wanted stream was
set to a stream of such. Now they are only skipped if they are not wanted
streams.
Fixes ffplay -sst <stream number> out.ts where stream number is a *_IMPAIRED stream.
Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* commit 'b5f851ed7e59f88b4130a420033d9fe191ec9e2f':
FATE: force FLAC in the lavf ogg test
Conflicts:
tests/lavf-regression.sh
See: 28caf13ac3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit '38893dc028e458eaf3f906833d4ee515689edb7e':
pcmdec: replace a reachable assert with an error check
Conflicts:
libavformat/pcmdec.c
No assert removed as there was none in FFmpeg in the equivalent function
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit 'cca4742a5e663cfe4dbd71f01f0c0fb042fddc1d':
doc/APIchanges: mark the place where 9 was branched
Conflicts:
doc/APIchanges
Not merged, as "9" was not a FFmpeg release and not branched anywhere from our APIChanges list
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit 'd711d839ca6714a5ef5b53ee51bc7632e62cf203':
doc/APIchanges: fill in missing hashes and dates
Conflicts:
doc/APIchanges
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit '2f6eec65acc953faed3951fb8f1eabed830fdd2f':
vp8: fix PPC assembly to work if src_stride != dst_stride
See: 34b429d5ba
Merged-by: Michael Niedermayer <michaelni@gmx.at>
