mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-12-26 09:12:33 +00:00
6cbe81999b
* qatar/master: (28 commits) Replace usages of av_get_bits_per_sample_fmt() with av_get_bytes_per_sample(). x86: cabac: fix register constraints for 32-bit mode cabac: move x86 asm to libavcodec/x86/cabac.h x86: h264: cast pointers to intptr_t rather than int x86: h264: remove hardcoded edi in decode_significance_8x8_x86() x86: h264: remove hardcoded esi in decode_significance[_8x8]_x86() x86: h264: remove hardcoded edx in decode_significance[_8x8]_x86() x86: h264: remove hardcoded eax in decode_significance[_8x8]_x86() x86: cabac: change 'a' constraint to 'r' in get_cabac_inline() x86: cabac: remove hardcoded esi in get_cabac_inline() x86: cabac: remove hardcoded edx in get_cabac_inline() x86: cabac: remove unused macro parameter x86: cabac: remove hardcoded ebx in inline asm x86: cabac: remove hardcoded struct offsets from inline asm cabac: remove inline asm under #if 0 cabac: remove BRANCHLESS_CABAC_DECODER switch cabac: remove #if 0 cascade under never-set #ifdef ARCH_X86_DISABLED document libswscale bump error_resilience: skip last-MV predictor step if MVs are not available. error_resilience: actually add counter when adding a MV predictor. ... Conflicts: Changelog libavcodec/error_resilience.c libavfilter/defaults.c libavfilter/vf_drawtext.c libswscale/swscale.h tests/ref/vsynth1/error tests/ref/vsynth2/error Merged-by: Michael Niedermayer <michaelni@gmx.at> |
||
---|---|---|
.. | ||
examples | ||
APIchanges | ||
avutil.txt | ||
bitstream_filters.texi | ||
build_system.txt | ||
decoders.texi | ||
demuxers.texi | ||
developer.texi | ||
encoders.texi | ||
eval.texi | ||
faq.texi | ||
fate.txt | ||
ffmpeg-mt-authorship.txt | ||
ffmpeg.texi | ||
ffplay.texi | ||
ffprobe.texi | ||
ffserver.conf | ||
ffserver.texi | ||
fftools-common-opts.texi | ||
filters.texi | ||
general.texi | ||
git-howto.txt | ||
indevs.texi | ||
issue_tracker.txt | ||
libavfilter.texi | ||
metadata.texi | ||
multithreading.txt | ||
muxers.texi | ||
optimization.txt | ||
outdevs.texi | ||
protocols.texi | ||
rate_distortion.txt | ||
RELEASE_NOTES | ||
snow.txt | ||
soc.txt | ||
swscale.txt | ||
t2h.init | ||
tablegen.txt | ||
texi2pod.pl | ||
TODO | ||
viterbi.txt |